diff --git a/MainWindow.xaml b/MainWindow.xaml
index 9a6e765..242700a 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -8,6 +8,26 @@
         MinHeight="660" MinWidth="860"
         Background="{DynamicResource AppWindowBrush}"
         Foreground="{DynamicResource AppTextBrush}">
+    <Window.Resources>
+        <Style x:Key="SettingsSectionBorder" TargetType="Border">
+            <Setter Property="Background" Value="{DynamicResource AppPanelBrush}"/>
+            <Setter Property="BorderBrush" Value="{DynamicResource AppBorderBrush}"/>
+            <Setter Property="BorderThickness" Value="1"/>
+            <Setter Property="CornerRadius" Value="12"/>
+            <Setter Property="Padding" Value="12"/>
+            <Setter Property="Margin" Value="0,0,0,12"/>
+        </Style>
+        <Style x:Key="SettingsSectionTitle" TargetType="TextBlock">
+            <Setter Property="FontWeight" Value="SemiBold"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Margin" Value="0,0,0,10"/>
+        </Style>
+        <Style x:Key="SettingsFieldLabel" TargetType="TextBlock">
+            <Setter Property="VerticalAlignment" Value="Center"/>
+            <Setter Property="Foreground" Value="{DynamicResource AppMutedTextBrush}"/>
+            <Setter Property="Margin" Value="0,0,8,8"/>
+        </Style>
+    </Window.Resources>
     <DockPanel Margin="18">
         <Border DockPanel.Dock="Top"
                 Margin="0,0,0,16"
@@ -162,111 +182,144 @@
                     <ScrollViewer Grid.Row="2"
                                   VerticalScrollBarVisibility="Auto"
                                   HorizontalScrollBarVisibility="Disabled">
-                        <Border Background="{DynamicResource AppPanelBrush}"
-                                BorderBrush="{DynamicResource AppBorderBrush}"
-                                BorderThickness="1"
-                                CornerRadius="12"
-                                Padding="12">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="110"/>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="Auto"/>
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="Auto"/>
-                            </Grid.RowDefinitions>
+                        <StackPanel>
+                            <Border Style="{StaticResource SettingsSectionBorder}">
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="110"/>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                    </Grid.RowDefinitions>
 
-                            <TextBlock Text="Title" VerticalAlignment="Center" Margin="0,0,8,8"/>
-                            <TextBox x:Name="TitleBox" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,0,0,8"
-                                     TextChanged="PreviewField_Changed"/>
+                                    <TextBlock Text="Item" Grid.ColumnSpan="3" Style="{StaticResource SettingsSectionTitle}"/>
 
-                            <TextBlock Text="Type" Grid.Row="1" VerticalAlignment="Center" Margin="0,0,8,8"/>
-                            <ComboBox x:Name="TypeBox" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,0,0,8"
-                                      SelectionChanged="TypeBox_SelectionChanged"/>
+                                    <TextBlock Text="Title" Grid.Row="1" Style="{StaticResource SettingsFieldLabel}"/>
+                                    <TextBox x:Name="TitleBox" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,0,0,8"
+                                             TextChanged="PreviewField_Changed"/>
 
-                            <TextBlock Text="Target" Grid.Row="2" VerticalAlignment="Center" Margin="0,0,8,8"/>
-                            <TextBox x:Name="TargetBox" Grid.Row="2" Grid.Column="1" Margin="0,0,8,8"
-                                     TextChanged="PreviewField_Changed"/>
-                            <StackPanel Grid.Row="2" Grid.Column="2" Orientation="Horizontal" Margin="0,0,0,8">
-                                <Button Content="File" Click="BrowseFile_Click" Margin="0,0,6,0" Padding="8,4"/>
-                                <Button Content="Folder" Click="BrowseFolder_Click" Padding="8,4"/>
-                            </StackPanel>
+                                    <TextBlock Text="Type" Grid.Row="2" Style="{StaticResource SettingsFieldLabel}"/>
+                                    <ComboBox x:Name="TypeBox" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,0,0,8"
+                                              SelectionChanged="TypeBox_SelectionChanged"/>
 
-                            <TextBlock Text="Arguments" Grid.Row="3" VerticalAlignment="Center" Margin="0,0,8,8"/>
-                            <TextBox x:Name="ArgumentsBox" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,0,0,8"/>
+                                    <TextBlock Text="Target" Grid.Row="3" Style="{StaticResource SettingsFieldLabel}"/>
+                                    <TextBox x:Name="TargetBox" Grid.Row="3" Grid.Column="1" Margin="0,0,8,8"
+                                             TextChanged="PreviewField_Changed"/>
+                                    <StackPanel Grid.Row="3" Grid.Column="2" Orientation="Horizontal" Margin="0,0,0,8">
+                                        <Button Content="File" Click="BrowseFile_Click" Margin="0,0,6,0" Padding="8,4"/>
+                                        <Button Content="Folder" Click="BrowseFolder_Click" Padding="8,4"/>
+                                    </StackPanel>
 
-                            <TextBlock Text="Working Folder" Grid.Row="4" VerticalAlignment="Center" Margin="0,0,8,8"/>
-                            <TextBox x:Name="WorkingFolderBox" Grid.Row="4" Grid.Column="1" Margin="0,0,8,8"/>
-                            <Button x:Name="WorkingFolderBrowseButton"
-                                    Grid.Row="4" Grid.Column="2"
-                                    Content="Folder"
-                                    Click="BrowseWorkingFolder_Click"
-                                    Padding="8,4"
-                                    Margin="0,0,0,8"/>
+                                    <TextBlock Text="Notes" Grid.Row="4" VerticalAlignment="Top" Foreground="{DynamicResource AppMutedTextBrush}" Margin="0,4,8,0"/>
+                                    <TextBox x:Name="NotesBox"
+                                             Grid.Row="4"
+                                             Grid.Column="1"
+                                             Grid.ColumnSpan="2"
+                                             Margin="0"
+                                             AcceptsReturn="True"
+                                             MinHeight="58"
+                                             TextWrapping="Wrap"
+                                             VerticalScrollBarVisibility="Auto"
+                                             TextChanged="PreviewField_Changed"/>
+                                </Grid>
+                            </Border>
 
-                            <TextBlock Text="Notes" Grid.Row="5" VerticalAlignment="Top" Margin="0,4,8,8"/>
-                            <TextBox x:Name="NotesBox"
-                                     Grid.Row="5"
-                                     Grid.Column="1"
-                                     Grid.ColumnSpan="2"
-                                     Margin="0,0,0,8"
-                                     AcceptsReturn="True"
-                                     MinHeight="54"
-                                     TextWrapping="Wrap"
-                                     VerticalScrollBarVisibility="Auto"
-                                     TextChanged="PreviewField_Changed"/>
+                            <Border Style="{StaticResource SettingsSectionBorder}">
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="110"/>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                    </Grid.RowDefinitions>
 
-                            <TextBlock Text="Icon Path" Grid.Row="6" VerticalAlignment="Center" Margin="0,0,8,0"/>
-                            <TextBox x:Name="IconPathBox" Grid.Row="6" Grid.Column="1" Margin="0,0,8,8"
-                                     TextChanged="PreviewField_Changed"/>
-                            <StackPanel Grid.Row="6" Grid.Column="2" Orientation="Horizontal" Margin="0,0,0,8">
-                                <Button Content="Icon" Click="BrowseIcon_Click" Padding="8,4" Margin="0,0,6,0"/>
-                                <Button Content="Reset" Click="ResetIcon_Click" Padding="8,4"/>
-                            </StackPanel>
+                                    <TextBlock Text="Launch" Grid.ColumnSpan="3" Style="{StaticResource SettingsSectionTitle}"/>
 
-                            <TextBlock Text="Selected Item Display" Grid.Row="7" VerticalAlignment="Center" Margin="0,0,8,8"/>
-                            <ComboBox x:Name="ItemDisplayModeBox" Grid.Row="7" Grid.Column="1" Grid.ColumnSpan="2"
-                                      Margin="0,0,0,8" SelectionChanged="ItemDisplayModeBox_SelectionChanged"/>
+                                    <TextBlock Text="Arguments" Grid.Row="1" Style="{StaticResource SettingsFieldLabel}"/>
+                                    <TextBox x:Name="ArgumentsBox" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,0,0,8"/>
 
-                            <TextBlock Text="Launch Options" Grid.Row="8" VerticalAlignment="Top" Margin="0,2,8,8"/>
-                            <StackPanel Grid.Row="8" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,0,0,8">
-                                <CheckBox x:Name="RunAsAdminBox"
-                                          Content="Run as administrator"
-                                          Margin="0,0,0,6"
-                                          Checked="LaunchOptionBox_Changed"
-                                          Unchecked="LaunchOptionBox_Changed"/>
-                                <CheckBox x:Name="StartMinimizedBox"
-                                          Content="Start minimized"
-                                          Checked="LaunchOptionBox_Changed"
-                                          Unchecked="LaunchOptionBox_Changed"/>
-                            </StackPanel>
+                                    <TextBlock Text="Working Folder" Grid.Row="2" Style="{StaticResource SettingsFieldLabel}"/>
+                                    <TextBox x:Name="WorkingFolderBox" Grid.Row="2" Grid.Column="1" Margin="0,0,8,8"/>
+                                    <Button x:Name="WorkingFolderBrowseButton"
+                                            Grid.Row="2" Grid.Column="2"
+                                            Content="Folder"
+                                            Click="BrowseWorkingFolder_Click"
+                                            Padding="8,4"
+                                            Margin="0,0,0,8"/>
 
-                            <TextBlock Text="Preview" Grid.Row="9" VerticalAlignment="Top" Margin="0,4,8,0"/>
-                            <Border Grid.Row="9" Grid.Column="1" Grid.ColumnSpan="2"
-                                    BorderThickness="1"
-                                    BorderBrush="{DynamicResource AppBorderBrush}"
-                                    Background="{DynamicResource AppSurfaceBrush}"
-                                    CornerRadius="12"
-                                    Padding="10" MinHeight="76">
+                                    <TextBlock Text="Options" Grid.Row="3" VerticalAlignment="Top" Foreground="{DynamicResource AppMutedTextBrush}" Margin="0,2,8,0"/>
+                                    <StackPanel Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2">
+                                        <CheckBox x:Name="RunAsAdminBox"
+                                                  Content="Run as administrator"
+                                                  Margin="0,0,0,6"
+                                                  Checked="LaunchOptionBox_Changed"
+                                                  Unchecked="LaunchOptionBox_Changed"/>
+                                        <CheckBox x:Name="StartMinimizedBox"
+                                                  Content="Start minimized"
+                                                  Checked="LaunchOptionBox_Changed"
+                                                  Unchecked="LaunchOptionBox_Changed"/>
+                                    </StackPanel>
+                                </Grid>
+                            </Border>
+
+                            <Border Style="{StaticResource SettingsSectionBorder}">
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="110"/>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                    </Grid.RowDefinitions>
+
+                                    <TextBlock Text="Appearance" Grid.ColumnSpan="3" Style="{StaticResource SettingsSectionTitle}"/>
+
+                                    <TextBlock Text="Icon Path" Grid.Row="1" Style="{StaticResource SettingsFieldLabel}"/>
+                                    <TextBox x:Name="IconPathBox" Grid.Row="1" Grid.Column="1" Margin="0,0,8,8"
+                                             TextChanged="PreviewField_Changed"/>
+                                    <StackPanel Grid.Row="1" Grid.Column="2" Orientation="Horizontal" Margin="0,0,0,8">
+                                        <Button Content="Icon" Click="BrowseIcon_Click" Padding="8,4" Margin="0,0,6,0"/>
+                                        <Button Content="Reset" Click="ResetIcon_Click" Padding="8,4"/>
+                                    </StackPanel>
+
+                                    <TextBlock Text="Display" Grid.Row="2" Style="{StaticResource SettingsFieldLabel}"/>
+                                    <ComboBox x:Name="ItemDisplayModeBox" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2"
+                                              Margin="0" SelectionChanged="ItemDisplayModeBox_SelectionChanged"/>
+                                </Grid>
+                            </Border>
+
+                            <Border Style="{StaticResource SettingsSectionBorder}" Margin="0">
                                 <StackPanel>
-                                    <ContentControl x:Name="PreviewHost"/>
-                                    <TextBlock x:Name="PreviewNote" Margin="0,8,0,0"
-                                               Foreground="{DynamicResource AppMutedTextBrush}"
-                                               TextWrapping="Wrap"/>
+                                    <TextBlock Text="Preview" Style="{StaticResource SettingsSectionTitle}"/>
+                                    <Border BorderThickness="1"
+                                            BorderBrush="{DynamicResource AppBorderBrush}"
+                                            Background="{DynamicResource AppSurfaceBrush}"
+                                            CornerRadius="12"
+                                            Padding="10" MinHeight="76">
+                                        <StackPanel>
+                                            <ContentControl x:Name="PreviewHost"/>
+                                            <TextBlock x:Name="PreviewNote" Margin="0,8,0,0"
+                                                       Foreground="{DynamicResource AppMutedTextBrush}"
+                                                       TextWrapping="Wrap"/>
+                                        </StackPanel>
+                                    </Border>
                                 </StackPanel>
                             </Border>
-                        </Grid>
-                        </Border>
+                        </StackPanel>
                     </ScrollViewer>
 
                     <TextBlock x:Name="StatusText" Grid.Row="3" Margin="4,14,4,0"
diff --git a/TaskbarLauncher.csproj b/TaskbarLauncher.csproj
index 760d625..fcc5929 100644
--- a/TaskbarLauncher.csproj
+++ b/TaskbarLauncher.csproj
@@ -12,8 +12,8 @@
     <Authors>Ray Berezowski</Authors>
     <ApplicationIcon>Assets\AppIcon.ico</ApplicationIcon>
     <Version>1.0.1</Version>
-    <AssemblyVersion>1.0.1.21</AssemblyVersion>
-    <FileVersion>1.0.1.21</FileVersion>
+    <AssemblyVersion>1.0.1.22</AssemblyVersion>
+    <FileVersion>1.0.1.22</FileVersion>
     <InformationalVersion>1.0.1</InformationalVersion>
   </PropertyGroup>