diff --git a/QBTracker/MainWindow.xaml b/QBTracker/MainWindow.xaml
index d02a081..e26d270 100644
--- a/QBTracker/MainWindow.xaml
+++ b/QBTracker/MainWindow.xaml
@@ -47,6 +47,8 @@
         ContextMenu="{StaticResource TrayMenu}"
         MenuActivation="LeftOrRightClick"
         PopupActivation="DoubleClick"
+        DoubleClickCommand="{x:Static SystemCommands.RestoreWindowCommand}"
+        DoubleClickCommandTarget="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
         LeftClickCommand="{x:Static SystemCommands.RestoreWindowCommand}"
         LeftClickCommandTarget="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
     />
diff --git a/QBTracker/Views/ExportView.xaml b/QBTracker/Views/ExportView.xaml
index 69fea4f..55e0d59 100644
--- a/QBTracker/Views/ExportView.xaml
+++ b/QBTracker/Views/ExportView.xaml
@@ -1,50 +1,55 @@
 <UserControl x:Class="QBTracker.Views.ExportView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:local="clr-namespace:QBTracker.Views"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:viewModels="clr-namespace:QBTracker.ViewModels"
              xmlns:converters="clr-namespace:QBTracker.Converters"
-             mc:Ignorable="d" 
+             mc:Ignorable="d"
              d:DesignHeight="694" d:DesignWidth="410">
     <Grid>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="*"/>
-        </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
-            <RowDefinition Height="60"/>
-            <RowDefinition Height="60"/>
-            <RowDefinition Height="42"/>
-            <RowDefinition Height="42"/>
-            <RowDefinition Height="60"/>
-            <RowDefinition Height="*"/>
+            <RowDefinition Height="60" />
+            <RowDefinition Height="60" />
+            <RowDefinition Height="42" />
+            <RowDefinition Height="42" />
+            <RowDefinition Height="60" />
+            <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
-        <Button
-            Style="{DynamicResource MaterialDesignFloatingActionMiniButton}"
-            Command="{Binding GoBack}"
-            VerticalAlignment="Center" HorizontalAlignment="Left"
-            IsCancel="True"
-            Margin="10">
-            <materialDesign:PackIcon Kind="StepBackward" />
-        </Button>
-        <TextBlock Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"
-            Margin="60,0" Foreground="{StaticResource MaterialDesignBody}"
-            Style="{StaticResource MaterialDesignSubtitle1TextBlock}" VerticalAlignment="Center" HorizontalAlignment="Center">
-            Export to Excel
-        </TextBlock>
-        <Button Grid.Row="0" Grid.Column="1"
-                Margin="10"
-                VerticalAlignment="Center"
-                HorizontalAlignment="Right"
-                Style="{StaticResource MaterialDesignFloatingActionMiniAccentButton}"
-                ToolTip="Export to Excel" 
-                Command="{Binding ExportCommand}" >
-            <materialDesign:PackIcon Kind="TableExport" Width="22" Height="22"/>
-        </Button>
+        <Border Grid.Row="0" Grid.Column="0" BorderBrush="{DynamicResource MaterialDesignDivider}" BorderThickness="0 0 0 1">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <Button
+                    Style="{DynamicResource MaterialDesignFloatingActionMiniButton}"
+                    Command="{Binding GoBack}"
+                    VerticalAlignment="Center" HorizontalAlignment="Left"
+                    IsCancel="True"
+                    Margin="10">
+                    <materialDesign:PackIcon Kind="StepBackward" />
+                </Button>
+                <TextBlock Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"
+                           Margin="60,0" Foreground="{StaticResource MaterialDesignBody}"
+                           Style="{StaticResource MaterialDesignSubtitle1TextBlock}" VerticalAlignment="Center"
+                           HorizontalAlignment="Center">
+                    Export to Excel
+                </TextBlock>
+                <Button Grid.Row="0" Grid.Column="1"
+                        Margin="10"
+                        VerticalAlignment="Center"
+                        HorizontalAlignment="Right"
+                        Style="{StaticResource MaterialDesignFloatingActionMiniAccentButton}"
+                        ToolTip="Export to Excel"
+                        Command="{Binding ExportCommand}">
+                    <materialDesign:PackIcon Kind="TableExport" Width="22" Height="22" />
+                </Button>
+            </Grid>
+        </Border>
         <DatePicker Grid.Row="1" Grid.Column="0" Margin="10,0,0,0"
                     Width="140"
                     HorizontalAlignment="Left"
@@ -58,7 +63,7 @@
                     SelectedDate="{Binding EndDate}"
                     Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
         <StackPanel Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2"
-            Orientation="Horizontal">
+                    Orientation="Horizontal">
             <RadioButton
                 Style="{StaticResource MaterialDesignDarkRadioButton}"
                 Margin="10"
@@ -76,7 +81,7 @@
                 Content="Round to 30 min" />
         </StackPanel>
         <StackPanel Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2"
-                    Orientation="Horizontal" 
+                    Orientation="Horizontal"
                     IsEnabled="{Binding ExportSettings.NoRounding, Converter={StaticResource InverterConverter}}">
             <RadioButton
                 Style="{StaticResource MaterialDesignDarkRadioButton}"
@@ -90,4 +95,4 @@
                 Content="Ceiling Rounding" />
         </StackPanel>
     </Grid>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/QBTracker/Views/MainView.xaml b/QBTracker/Views/MainView.xaml
index 490a5b0..5e1a4f0 100644
--- a/QBTracker/Views/MainView.xaml
+++ b/QBTracker/Views/MainView.xaml
@@ -17,61 +17,56 @@
             <RowDefinition Height="80" />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="100*" />
-            </Grid.ColumnDefinitions>
-            <Grid
-                Grid.Row="0"
-                Grid.Column="0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <Button Grid.Column="0"
+        <Border Grid.Row="0" Grid.Column="0" BorderBrush="{DynamicResource MaterialDesignDivider}" BorderThickness="0 0 0 1">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Button Grid.Column="0"
                         Style="{StaticResource MaterialDesignIconButton}"
                         ToolTip="Select today"
                         Command="{Binding SelectToday}">
-                    <materialDesign:PackIcon Kind="CalendarToday" />
-                </Button>
-                <Button Grid.Column="1"
+                        <materialDesign:PackIcon Kind="CalendarToday" />
+                    </Button>
+                    <Button Grid.Column="1"
                         Style="{StaticResource MaterialDesignIconButton}"
                         ToolTip="Select previous day"
                         Command="{Binding DateStepBack}">
-                    <materialDesign:PackIcon Kind="StepBackward" />
-                </Button>
-                <DatePicker Grid.Column="2"
+                        <materialDesign:PackIcon Kind="StepBackward" />
+                    </Button>
+                    <DatePicker Grid.Column="2"
                             SelectedDate="{Binding SelectedDate}"
                             Width="120"
                             materialDesign:HintAssist.Hint="Pick Date"
                             Style="{StaticResource MaterialDesignFloatingHintDatePicker}" VerticalAlignment="Center"
                             HorizontalAlignment="Center" Height="35" />
-                <Button Grid.Column="3"
+                    <Button Grid.Column="3"
                         Style="{StaticResource MaterialDesignIconButton}"
                         ToolTip="Select next day"
                         Command="{Binding DateStepForward}">
-                    <materialDesign:PackIcon Kind="StepForward" />
-                </Button>
-                <Button Grid.Column="6"
+                        <materialDesign:PackIcon Kind="StepForward" />
+                    </Button>
+                    <Button Grid.Column="6"
                         Style="{StaticResource MaterialDesignIconButton}"
                         ToolTip="Export to Excel"
                         Command="{Binding ExportCommand}" HorizontalAlignment="Right">
-                    <materialDesign:PackIcon Kind="TableExport" />
-                </Button>
-                <Button Grid.Column="7"
+                        <materialDesign:PackIcon Kind="TableExport" />
+                    </Button>
+                    <Button Grid.Column="7"
                         Style="{StaticResource MaterialDesignIconButton}"
                         ToolTip="Settings"
                         Command="{Binding SettingsCommand}" HorizontalAlignment="Right">
-                    <materialDesign:PackIcon Kind="Settings" />
-                </Button>
-            </Grid>
-        </Grid>
+                        <materialDesign:PackIcon Kind="Settings" />
+                    </Button>
+                </Grid>
+        </Border>
 
         <ItemsControl
             Grid.Row="1"
diff --git a/QBTracker/Views/ProjectView.xaml b/QBTracker/Views/ProjectView.xaml
index ed6e5b1..0939c31 100644
--- a/QBTracker/Views/ProjectView.xaml
+++ b/QBTracker/Views/ProjectView.xaml
@@ -16,20 +16,25 @@
             <RowDefinition Height="60" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <Button
-            Grid.Row="0"
-            Style="{DynamicResource MaterialDesignFloatingActionMiniButton}"
-            Command="{Binding GoBack}"
-            IsCancel="True"
-            VerticalAlignment="Center" HorizontalAlignment="Left"
-            Margin="10">
-            <materialDesign:PackIcon Kind="StepBackward" />
-        </Button>
-        <TextBlock Grid.Row="0" Grid.Column="0"
-                   Margin="60,0" Foreground="{StaticResource MaterialDesignBody}"
-                   Style="{StaticResource MaterialDesignSubtitle1TextBlock}" VerticalAlignment="Center" HorizontalAlignment="Center">
-            Manage projects
-        </TextBlock>
+        <Border Grid.Row="0" Grid.Column="0" BorderBrush="{DynamicResource MaterialDesignDivider}" BorderThickness="0 0 0 1">
+            <Grid>
+                <Button
+                    Grid.Row="0"
+                    Style="{DynamicResource MaterialDesignFloatingActionMiniButton}"
+                    Command="{Binding GoBack}"
+                    IsCancel="True"
+                    VerticalAlignment="Center" HorizontalAlignment="Left"
+                    Margin="10">
+                    <materialDesign:PackIcon Kind="StepBackward" />
+                </Button>
+                <TextBlock Grid.Row="0" Grid.Column="0"
+                           Margin="60,0" Foreground="{StaticResource MaterialDesignBody}"
+                           Style="{StaticResource MaterialDesignSubtitle1TextBlock}" VerticalAlignment="Center"
+                           HorizontalAlignment="Center">
+                    Manage projects
+                </TextBlock>
+            </Grid>
+        </Border>
         <TextBox
             Text="{Binding Name, UpdateSourceTrigger=PropertyChanged}"
             Grid.Row="1"
@@ -66,14 +71,14 @@
                                 <ColumnDefinition SharedSizeGroup="DeleteButton" Width="Auto" />
                             </Grid.ColumnDefinitions>
                             <StackPanel HorizontalAlignment="Stretch"
-                                Margin="8 0 0 0"
-                                Grid.Column="0">
+                                        Margin="8 0 0 0"
+                                        Grid.Column="0">
                                 <TextBlock FontWeight="Bold" Text="{Binding Name}" />
                                 <TextBlock Text="{Binding Stats}" />
                             </StackPanel>
                             <Button Grid.Column="1" Margin="1" Width="20" Height="20"
                                     Style="{StaticResource MaterialDesignFloatingActionMiniAccentButton}"
-                                    ToolTip="Delete Project" 
+                                    ToolTip="Delete Project"
                                     Command="{Binding DeleteCommand}">
                                 <materialDesign:PackIcon
                                     Kind="Delete"
@@ -86,7 +91,8 @@
             </ItemsControl.ItemTemplate>
             <ItemsControl.Template>
                 <ControlTemplate>
-                    <ScrollViewer x:Name="ScrollViewer" Padding="{TemplateBinding Padding}" VerticalScrollBarVisibility="Auto">
+                    <ScrollViewer x:Name="ScrollViewer" Padding="{TemplateBinding Padding}"
+                                  VerticalScrollBarVisibility="Auto">
                         <ItemsPresenter />
                     </ScrollViewer>
                 </ControlTemplate>
diff --git a/QBTracker/Views/SettingsView.xaml b/QBTracker/Views/SettingsView.xaml
index 554adcd..9109369 100644
--- a/QBTracker/Views/SettingsView.xaml
+++ b/QBTracker/Views/SettingsView.xaml
@@ -1,35 +1,40 @@
 <UserControl x:Class="QBTracker.Views.SettingsView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:local="clr-namespace:QBTracker.Views"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:viewModels="clr-namespace:QBTracker.ViewModels"
              xmlns:converters="clr-namespace:QBTracker.Converters"
-             mc:Ignorable="d" 
+             mc:Ignorable="d"
              d:DesignHeight="694" d:DesignWidth="410">
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="60"/>
-            <RowDefinition Height="80"/>
-            <RowDefinition Height="60"/>
-            <RowDefinition Height="*"/>
+            <RowDefinition Height="60" />
+            <RowDefinition Height="80" />
+            <RowDefinition Height="60" />
+            <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <Button
-            Grid.Row="0"
-            Style="{DynamicResource MaterialDesignFloatingActionMiniButton}"
-            Command="{Binding GoBack}"
-            IsCancel="True"
-            VerticalAlignment="Center" HorizontalAlignment="Left"
-            Margin="10">
-            <materialDesign:PackIcon Kind="StepBackward" />
-        </Button>
-        <TextBlock Grid.Row="0" Grid.Column="0"
-                   Margin="60,0" Foreground="{StaticResource MaterialDesignBody}"
-                   Style="{StaticResource MaterialDesignSubtitle1TextBlock}" VerticalAlignment="Center" HorizontalAlignment="Center">
-            Settings
-        </TextBlock>
+        <Border Grid.Row="0" Grid.Column="0" BorderBrush="{DynamicResource MaterialDesignDivider}" BorderThickness="0 0 0 1">
+            <Grid>
+                <Button
+                    Grid.Row="0"
+                    Style="{DynamicResource MaterialDesignFloatingActionMiniButton}"
+                    Command="{Binding GoBack}"
+                    IsCancel="True"
+                    VerticalAlignment="Center" HorizontalAlignment="Left"
+                    Margin="10">
+                    <materialDesign:PackIcon Kind="StepBackward" />
+                </Button>
+                <TextBlock Grid.Row="0" Grid.Column="0"
+                           Margin="60,0" Foreground="{StaticResource MaterialDesignBody}"
+                           Style="{StaticResource MaterialDesignSubtitle1TextBlock}" VerticalAlignment="Center"
+                           HorizontalAlignment="Center">
+                    Settings
+                </TextBlock>
+            </Grid>
+        </Border>
         <Grid Grid.Row="1">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition />
@@ -41,27 +46,31 @@
                 <ToggleButton Margin="8 0 8 0" IsChecked="{Binding IsDark}" />
                 <TextBlock VerticalAlignment="Center">Dark</TextBlock>
             </StackPanel>
-            <ComboBox Grid.Column="1" Margin="2"  
+            <ComboBox Grid.Column="1" Margin="2"
                       Foreground="{Binding PrimaryColor, Converter={StaticResource MaterialColorConverter}}"
                       Style="{StaticResource MaterialDesignFilledComboBox}"
                       materialDesign:HintAssist.Hint="Primary Color"
-                      ItemsSource="{Binding PrimaryColors}" SelectedItem="{Binding PrimaryColor}" VerticalAlignment="Center"
+                      ItemsSource="{Binding PrimaryColors}" SelectedItem="{Binding PrimaryColor}"
+                      VerticalAlignment="Center"
                       materialDesign:ComboBoxAssist.ShowSelectedItem="true">
                 <ComboBox.ItemTemplate>
                     <DataTemplate>
-                        <TextBlock Text="{Binding}" Foreground="{Binding Converter={StaticResource MaterialColorConverter}}"/>
+                        <TextBlock Text="{Binding}"
+                                   Foreground="{Binding Converter={StaticResource MaterialColorConverter}}" />
                     </DataTemplate>
                 </ComboBox.ItemTemplate>
             </ComboBox>
-            <ComboBox Grid.Column="2" Margin="2" 
+            <ComboBox Grid.Column="2" Margin="2"
                       Foreground="{Binding SecondaryColor, Converter={StaticResource MaterialColorConverter}}"
                       Style="{StaticResource MaterialDesignFilledComboBox}"
                       materialDesign:HintAssist.Hint="Secondary color"
-                      ItemsSource="{Binding SecondaryColors}" SelectedItem="{Binding SecondaryColor}" VerticalAlignment="Center"
+                      ItemsSource="{Binding SecondaryColors}" SelectedItem="{Binding SecondaryColor}"
+                      VerticalAlignment="Center"
                       materialDesign:ComboBoxAssist.ShowSelectedItem="true">
                 <ComboBox.ItemTemplate>
                     <DataTemplate>
-                        <TextBlock Text="{Binding}" Foreground="{Binding Converter={StaticResource MaterialColorConverter}}"/>
+                        <TextBlock Text="{Binding}"
+                                   Foreground="{Binding Converter={StaticResource MaterialColorConverter}}" />
                     </DataTemplate>
                 </ComboBox.ItemTemplate>
             </ComboBox>
@@ -77,16 +86,16 @@
                           IsChecked="{Binding AutomaticallyStart}" />
         </Grid>
         <TextBox Grid.Row="3" Grid.Column="0" Margin="10" Visibility="Collapsed"
-             Style="{StaticResource MaterialDesignOutlinedTextFieldTextBox}"
-             Text="{Binding Debug, Mode=OneWay}"
-             IsReadOnly="True"
-             VerticalAlignment="Top"
-             AcceptsReturn="True"
-             TextWrapping="NoWrap"
-             MaxWidth="400"
-             MinHeight="200"
-             materialDesign:HintAssist.Hint="Debug"
-             VerticalScrollBarVisibility="Auto" 
-             HorizontalScrollBarVisibility="Auto"/>
+                 Style="{StaticResource MaterialDesignOutlinedTextFieldTextBox}"
+                 Text="{Binding Debug, Mode=OneWay}"
+                 IsReadOnly="True"
+                 VerticalAlignment="Top"
+                 AcceptsReturn="True"
+                 TextWrapping="NoWrap"
+                 MaxWidth="400"
+                 MinHeight="200"
+                 materialDesign:HintAssist.Hint="Debug"
+                 VerticalScrollBarVisibility="Auto"
+                 HorizontalScrollBarVisibility="Auto" />
     </Grid>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/QBTracker/Views/TaskView.xaml b/QBTracker/Views/TaskView.xaml
index f8b90a9..6525cbf 100644
--- a/QBTracker/Views/TaskView.xaml
+++ b/QBTracker/Views/TaskView.xaml
@@ -17,20 +17,25 @@
             <RowDefinition Height="60" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <Button
-            Grid.Row="0"
-            Style="{DynamicResource MaterialDesignFloatingActionMiniButton}"
-            Command="{Binding GoBack}"
-            IsCancel="True"
-            VerticalAlignment="Center" HorizontalAlignment="Left"
-            Margin="10">
-            <materialDesign:PackIcon Kind="StepBackward" />
-        </Button>
-        <TextBlock Grid.Row="0" Grid.Column="0"
-                   Margin="60,0" Foreground="{StaticResource MaterialDesignBody}"
-                   Style="{StaticResource MaterialDesignSubtitle1TextBlock}" VerticalAlignment="Center" HorizontalAlignment="Center">
-            Manage tasks
-        </TextBlock>
+        <Border Grid.Row="0" Grid.Column="0" BorderBrush="{DynamicResource MaterialDesignDivider}" BorderThickness="0 0 0 1">
+            <Grid>
+                <Button
+                    Grid.Row="0"
+                    Style="{DynamicResource MaterialDesignFloatingActionMiniButton}"
+                    Command="{Binding GoBack}"
+                    IsCancel="True"
+                    VerticalAlignment="Center" HorizontalAlignment="Left"
+                    Margin="10">
+                    <materialDesign:PackIcon Kind="StepBackward" />
+                </Button>
+                <TextBlock Grid.Row="0" Grid.Column="0"
+                           Margin="60,0" Foreground="{StaticResource MaterialDesignBody}"
+                           Style="{StaticResource MaterialDesignSubtitle1TextBlock}" VerticalAlignment="Center"
+                           HorizontalAlignment="Center">
+                    Manage tasks
+                </TextBlock>
+            </Grid>
+        </Border>
         <TextBox
             x:Name="TaskBox"
             Text="{Binding Name, UpdateSourceTrigger=PropertyChanged}"
@@ -67,14 +72,14 @@
                                 <ColumnDefinition SharedSizeGroup="DeleteButton" Width="Auto" />
                             </Grid.ColumnDefinitions>
                             <StackPanel HorizontalAlignment="Stretch"
-                                Margin="8 0 0 0"
-                                Grid.Column="0">
+                                        Margin="8 0 0 0"
+                                        Grid.Column="0">
                                 <TextBlock FontWeight="Bold" Text="{Binding Name}" />
                                 <TextBlock Text="{Binding Stats}" />
                             </StackPanel>
                             <Button Grid.Column="1" Margin="1" Width="20" Height="20"
                                     Style="{StaticResource MaterialDesignFloatingActionMiniAccentButton}"
-                                    ToolTip="Delete Task" 
+                                    ToolTip="Delete Task"
                                     Command="{Binding DeleteCommand}">
                                 <materialDesign:PackIcon
                                     Kind="Delete"
@@ -87,7 +92,8 @@
             </ItemsControl.ItemTemplate>
             <ItemsControl.Template>
                 <ControlTemplate>
-                    <ScrollViewer x:Name="ScrollViewer" Padding="{TemplateBinding Padding}" VerticalScrollBarVisibility="Auto">
+                    <ScrollViewer x:Name="ScrollViewer" Padding="{TemplateBinding Padding}"
+                                  VerticalScrollBarVisibility="Auto">
                         <ItemsPresenter />
                     </ScrollViewer>
                 </ControlTemplate>
diff --git a/QBTracker/Views/TimeRecordView.xaml b/QBTracker/Views/TimeRecordView.xaml
index e7b6399..9787481 100644
--- a/QBTracker/Views/TimeRecordView.xaml
+++ b/QBTracker/Views/TimeRecordView.xaml
@@ -1,8 +1,8 @@
 <UserControl x:Class="QBTracker.Views.TimeRecordView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:local="clr-namespace:QBTracker.Views"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:conrol="clr-namespace:QBTracker.Conrol"
@@ -10,8 +10,8 @@
              d:DesignHeight="694" d:DesignWidth="410">
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="120"/>
-            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="120" />
+            <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
             <RowDefinition Height="60" />
@@ -19,31 +19,42 @@
             <RowDefinition Height="60" />
             <RowDefinition Height="60" />
             <RowDefinition Height="60" />
-            <RowDefinition Height="*"/>
+            <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <Button
-            Grid.Row="0"
-            Style="{DynamicResource MaterialDesignFloatingActionMiniButton}"
-            Command="{Binding GoBack}"
-            VerticalAlignment="Center" HorizontalAlignment="Left"
-            IsCancel="True"
-            Margin="10">
-            <materialDesign:PackIcon Kind="StepBackward" />
-        </Button>
-        <Button Grid.Column="1" Margin="10"
-                VerticalAlignment="Center"
-                HorizontalAlignment="Right"
-                Style="{StaticResource MaterialDesignFloatingActionMiniAccentButton}"
-                ToolTip="Delete Time Record" 
-                Command="{Binding DeleteCommand}">
-            <materialDesign:PackIcon Kind="Delete"/>
-        </Button>
-        <TextBlock Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"
-                   Margin="60,0" Foreground="{DynamicResource MaterialDesignBody}"
-                   Style="{StaticResource MaterialDesignSubtitle1TextBlock}" VerticalAlignment="Center" HorizontalAlignment="Center">
-            Manage time record
-        </TextBlock>
-        <Grid Grid.Row="1" Grid.ColumnSpan="2" Grid.IsEnabled="{Binding IsNotRecording}" Margin="0,1,0,59" Grid.RowSpan="2">
+        <Border Grid.Row="0" Grid.ColumnSpan="2" BorderBrush="{DynamicResource MaterialDesignDivider}" BorderThickness="0 0 0 1">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="120" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <Button
+                    Grid.Row="0"
+                    Style="{DynamicResource MaterialDesignFloatingActionMiniButton}"
+                    Command="{Binding GoBack}"
+                    VerticalAlignment="Center" HorizontalAlignment="Left"
+                    IsCancel="True"
+                    Margin="10">
+                    <materialDesign:PackIcon Kind="StepBackward" />
+                </Button>
+                <Button Grid.Column="1" Margin="10"
+                        VerticalAlignment="Center"
+                        HorizontalAlignment="Right"
+                        Style="{StaticResource MaterialDesignFloatingActionMiniAccentButton}"
+                        ToolTip="Delete Time Record"
+                        Command="{Binding DeleteCommand}">
+                    <materialDesign:PackIcon Kind="Delete" />
+                </Button>
+                <TextBlock Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"
+                           Margin="60,0" Foreground="{DynamicResource MaterialDesignBody}"
+                           Style="{StaticResource MaterialDesignSubtitle1TextBlock}" VerticalAlignment="Center"
+                           HorizontalAlignment="Center">
+                    Manage time record
+                </TextBlock>
+            </Grid>
+        </Border>
+
+        <Grid Grid.Row="1" Grid.ColumnSpan="2" Grid.IsEnabled="{Binding IsNotRecording}" Margin="0,1,0,59"
+              Grid.RowSpan="2">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="100*" />
                 <ColumnDefinition Width="100*" />
@@ -104,11 +115,16 @@
             </Button>
         </Grid>
         <TextBlock Text="Duration" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Margin="10" />
-        <TextBlock FontSize="18" Text="{Binding Duration, Mode=OneWay, StringFormat={}{0:h\\h\\ m\\m}}" Grid.Row="2" Grid.Column="1" VerticalAlignment="Center" Margin="10" Foreground="{DynamicResource SecondaryHueLightBrush}"/>
+        <TextBlock FontSize="18" Text="{Binding Duration, Mode=OneWay, StringFormat={}{0:h\\h\\ m\\m}}" Grid.Row="2"
+                   Grid.Column="1" VerticalAlignment="Center" Margin="10"
+                   Foreground="{DynamicResource SecondaryHueLightBrush}" />
         <TextBlock Text="Start time" Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Margin="10" />
-        <conrol:DateTimePicker Grid.Row="3" Grid.Column="1" Width="200" Height="32" DateValue="{Binding StarTime}" HorizontalAlignment="Left"  VerticalAlignment="Center"/>
+        <conrol:DateTimePicker Grid.Row="3" Grid.Column="1" Width="200" Height="32" DateValue="{Binding StarTime}"
+                               HorizontalAlignment="Left" VerticalAlignment="Center" />
         <TextBlock Text="End time" Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" Margin="10" />
-        <conrol:DateTimePicker Grid.Row="4" Grid.Column="1" Width="200" Height="32" DateValue="{Binding EndTime}" HorizontalAlignment="Left"  VerticalAlignment="Center" IsEnabled="{Binding IsEndTimeEnabled, Mode=OneWay}"/>
+        <conrol:DateTimePicker Grid.Row="4" Grid.Column="1" Width="200" Height="32" DateValue="{Binding EndTime}"
+                               HorizontalAlignment="Left" VerticalAlignment="Center"
+                               IsEnabled="{Binding IsEndTimeEnabled, Mode=OneWay}" />
         <TextBox Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="2" Margin="10"
                  Style="{StaticResource MaterialDesignOutlinedTextFieldTextBox}"
                  Text="{Binding Notes}"
@@ -118,6 +134,6 @@
                  MaxWidth="400"
                  MinHeight="100"
                  materialDesign:HintAssist.Hint="Notes"
-                 VerticalScrollBarVisibility="Auto"/>
+                 VerticalScrollBarVisibility="Auto" />
     </Grid>
-</UserControl>
+</UserControl>
\ No newline at end of file