diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
index f7b2602a1..4979bf66a 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
@@ -5,55 +5,57 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:program="clr-namespace:Flow.Launcher.Plugin.Program"
-    Height="450"
-    d:DesignHeight="404.508"
-    d:DesignWidth="600"
+    Height="550"
     DataContext="{Binding RelativeSource={RelativeSource Self}}"
     mc:Ignorable="d">
-    <Grid Margin="20">
+    <Grid Margin="0">
         <Grid.RowDefinitions>
-            <RowDefinition Height="165" />
+            <RowDefinition Height="240" />
             <RowDefinition Height="*" />
-            <RowDefinition Height="50" />
+            <RowDefinition Height="60" />
         </Grid.RowDefinitions>
         <StackPanel
             Grid.Row="0"
             HorizontalAlignment="Stretch"
-            Orientation="Horizontal">
+            Orientation="Vertical">
             <StackPanel Width="Auto" Orientation="Vertical">
                 <CheckBox
                     Name="StartMenuEnabled"
-                    Margin="5"
+                    Margin="70,10,10,10"
                     Content="{DynamicResource flowlauncher_plugin_program_index_start}"
                     IsChecked="{Binding EnableStartMenuSource}"
                     ToolTip="{DynamicResource flowlauncher_plugin_program_index_start_tooltip}" />
+                <Separator />
                 <CheckBox
                     Name="RegistryEnabled"
-                    Margin="5"
+                    Margin="70,10,10,10"
                     Content="{DynamicResource flowlauncher_plugin_program_index_registry}"
                     IsChecked="{Binding EnableRegistrySource}"
                     ToolTip="{DynamicResource flowlauncher_plugin_program_index_registry_tooltip}" />
+                <Separator />
                 <CheckBox
                     Name="HideLnkEnabled"
-                    Margin="5"
+                    Margin="70,10,10,10"
                     Content="{DynamicResource flowlauncher_plugin_program_enable_hidelnkpath}"
                     IsChecked="{Binding EnableHideLnkPath}"
                     ToolTip="{DynamicResource flowlauncher_plugin_program_enable_hidelnkpath_tooltip}" />
+                <Separator />
                 <CheckBox
                     Name="DescriptionEnabled"
-                    Margin="5"
+                    Margin="70,10,10,10"
                     Content="{DynamicResource flowlauncher_plugin_program_enable_description}"
                     IsChecked="{Binding EnableDescription}"
                     ToolTip="{DynamicResource flowlauncher_plugin_program_enable_description_tooltip}" />
+                <Separator />
             </StackPanel>
             <StackPanel
                 Width="Auto"
-                HorizontalAlignment="Right"
+                Margin="20,6,0,6"
+                HorizontalAlignment="Left"
                 Orientation="Horizontal">
                 <Button
                     x:Name="btnLoadAllProgramSource"
                     Width="100"
-                    Height="31"
                     Margin="10"
                     HorizontalAlignment="Right"
                     Click="btnLoadAllProgramSource_OnClick"
@@ -61,7 +63,6 @@
                 <Button
                     x:Name="btnProgramSuffixes"
                     Width="100"
-                    Height="31"
                     Margin="10"
                     HorizontalAlignment="Right"
                     Click="BtnProgramSuffixes_OnClick"
@@ -69,7 +70,6 @@
                 <Button
                     x:Name="btnReindex"
                     Width="100"
-                    Height="31"
                     Margin="10"
                     HorizontalAlignment="Right"
                     Click="btnReindex_Click"
@@ -79,7 +79,7 @@
         <ListView
             x:Name="programSourceView"
             Grid.Row="1"
-            Margin="0,13,0,10"
+            Margin="20,10,20,0"
             AllowDrop="True"
             BorderBrush="DarkGray"
             BorderThickness="1"
@@ -127,7 +127,7 @@
         <DockPanel
             Grid.Row="2"
             Grid.RowSpan="1"
-            Margin="0,0,0,0">
+            Margin="0,0,20,10">
             <StackPanel
                 x:Name="indexingPanel"
                 HorizontalAlignment="Left"