diff --git a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
index 3893c92e1..7cf3af292 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
@@ -16,11 +16,13 @@
     <system:String x:Key="flowlauncher_plugin_program_suffixes">File Type</system:String>
     <system:String x:Key="flowlauncher_plugin_program_reindex">Reindex</system:String>
     <system:String x:Key="flowlauncher_plugin_program_indexing">Indexing</system:String>
-    <system:String x:Key="flowlauncher_plugin_program_index_start">Index Start Menu</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_index_source">Index Source</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_index_option">Option</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_index_start">Start Menu</system:String>
     <system:String x:Key="flowlauncher_plugin_program_index_start_tooltip">When enabled, Flow will load programs from the start menu</system:String>
-    <system:String x:Key="flowlauncher_plugin_program_index_registry">Index Registry</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_index_registry">Registry</system:String>
     <system:String x:Key="flowlauncher_plugin_program_index_registry_tooltip">When enabled, Flow will load programs from the registry</system:String>
-    <system:String x:Key="flowlauncher_plugin_program_index_PATH">Index PATH</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_index_PATH">PATH</system:String>
     <system:String x:Key="flowlauncher_plugin_program_index_PATH_tooltip">When enabled, Flow will load programs from the PATH environment variable</system:String>
     <system:String x:Key="flowlauncher_plugin_program_enable_hidelnkpath">Hide app path</system:String>
     <system:String x:Key="flowlauncher_plugin_program_enable_hidelnkpath_tooltip">For executable files such as UWP or lnk, hide the file path from being visible</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
index 6054b5c54..4d6db38fd 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
@@ -10,56 +10,88 @@
     mc:Ignorable="d">
     <Grid Margin="0">
         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
             <RowDefinition Height="60" />
         </Grid.RowDefinitions>
-        <StackPanel
-            Grid.Row="0"
+        <DockPanel
+            Margin="70,10,0,8"
             HorizontalAlignment="Stretch"
-            Orientation="Vertical">
-            <WrapPanel Width="Auto" Margin="70,8,10,0">
-                <CheckBox
-                    Name="HideLnkEnabled"
-                    Margin="0,0,30,8"
-                    Content="{DynamicResource flowlauncher_plugin_program_enable_hidelnkpath}"
-                    IsChecked="{Binding HideAppsPath}"
-                    ToolTip="{DynamicResource flowlauncher_plugin_program_enable_hidelnkpath_tooltip}" />
-                <CheckBox
-                    Name="DescriptionEnabled"
-                    Margin="0,0,30,8"
-                    Content="{DynamicResource flowlauncher_plugin_program_enable_description}"
-                    IsChecked="{Binding EnableDescription}"
-                    ToolTip="{DynamicResource flowlauncher_plugin_program_enable_description_tooltip}" />
-
+            LastChildFill="True">
+            <TextBlock
+                MinWidth="120"
+                Margin="0,5,10,0"
+                Text="{DynamicResource flowlauncher_plugin_program_index_source}" />
+            <WrapPanel
+                Width="Auto"
+                Margin="0,0,14,0"
+                HorizontalAlignment="Right"
+                DockPanel.Dock="Right">
                 <CheckBox
                     Name="StartMenuEnabled"
-                    Margin="0,0,30,8"
+                    Margin="12,0,12,0"
                     Content="{DynamicResource flowlauncher_plugin_program_index_start}"
                     IsChecked="{Binding EnableStartMenuSource}"
                     ToolTip="{DynamicResource flowlauncher_plugin_program_index_start_tooltip}" />
                 <CheckBox
                     Name="RegistryEnabled"
-                    Margin="0,0,30,8"
+                    Margin="12,0,12,0"
                     Content="{DynamicResource flowlauncher_plugin_program_index_registry}"
                     IsChecked="{Binding EnableRegistrySource}"
                     ToolTip="{DynamicResource flowlauncher_plugin_program_index_registry_tooltip}" />
 
                 <CheckBox
                     Name="PATHEnabled"
-                    Margin="0,0,30,8"
+                    Margin="12,0,12,0"
                     Content="{DynamicResource flowlauncher_plugin_program_index_PATH}"
                     IsChecked="{Binding EnablePATHSource}"
                     ToolTip="{DynamicResource flowlauncher_plugin_program_index_PATH_tooltip}" />
-
             </WrapPanel>
+        </DockPanel>
+
+        <StackPanel
+            Grid.Row="1"
+            HorizontalAlignment="Stretch"
+            Orientation="Vertical">
+            <Separator
+                Height="1"
+                BorderBrush="{DynamicResource Color03B}"
+                BorderThickness="1" />
+            <DockPanel
+                Margin="70,10,0,8"
+                HorizontalAlignment="Stretch"
+                LastChildFill="True">
+                <TextBlock
+                    MinWidth="120"
+                    Margin="0,5,10,0"
+                    Text="{DynamicResource flowlauncher_plugin_program_index_option}" />
+                <WrapPanel
+                    Width="Auto"
+                    Margin="0,0,14,0"
+                    HorizontalAlignment="Right"
+                    DockPanel.Dock="Right">
+                    <CheckBox
+                        Name="HideLnkEnabled"
+                        Margin="12,0,12,0"
+                        Content="{DynamicResource flowlauncher_plugin_program_enable_hidelnkpath}"
+                        IsChecked="{Binding HideAppsPath}"
+                        ToolTip="{DynamicResource flowlauncher_plugin_program_enable_hidelnkpath_tooltip}" />
+                    <CheckBox
+                        Name="DescriptionEnabled"
+                        Margin="12,0,12,0"
+                        Content="{DynamicResource flowlauncher_plugin_program_enable_description}"
+                        IsChecked="{Binding EnableDescription}"
+                        ToolTip="{DynamicResource flowlauncher_plugin_program_enable_description_tooltip}" />
+                </WrapPanel>
+            </DockPanel>
             <Separator
                 Height="1"
                 BorderBrush="{DynamicResource Color03B}"
                 BorderThickness="1" />
             <StackPanel
                 Width="Auto"
-                Margin="10,6,0,0"
+                Margin="60,6,0,0"
                 HorizontalAlignment="Left"
                 Orientation="Horizontal">
                 <Button
@@ -105,8 +137,8 @@
         </StackPanel>
         <ListView
             x:Name="programSourceView"
-            Grid.Row="1"
-            Margin="20,0,20,0"
+            Grid.Row="2"
+            Margin="70,0,20,0"
             AllowDrop="True"
             BorderBrush="DarkGray"
             BorderThickness="1"
@@ -145,7 +177,7 @@
             </ListView.View>
         </ListView>
         <DockPanel
-            Grid.Row="2"
+            Grid.Row="3"
             Grid.RowSpan="1"
             Margin="0,0,20,10">
             <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">