diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 7b45c7448..bedad7f91 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -191,7 +191,7 @@
         <Style x:Key="PluginList" TargetType="ListBoxItem">
             <Setter Property="Background" Value="#ffffff" />
             <Setter Property="Padding" Value="0 12 0 12" />
-            <Setter Property="Margin" Value="0 4 18 0" />
+            <Setter Property="Margin" Value="0 0 18 4" />
             <Setter Property="HorizontalContentAlignment" Value="Stretch" />
             <Setter Property="BorderBrush" Value="#e5e5e5" />
             <!--#region Template for blue highlight win10-->
@@ -537,14 +537,18 @@
                 <Border Grid.Row="0" Background="#f3f3f3" Padding="5 18 0 0">
                     <TextBlock Text="{DynamicResource plugin}" TextAlignment="left" FontSize="30" Margin="0 5 0 5"/>
                 </Border>
-                <Border Grid.Column="0" Grid.Row="1" Background="#f3f3f3">
+                <Border Grid.Column="0" Grid.Row="1" Background="#f3f3f3" Padding="0 0 0 0">
                     <ListBox SelectedItem="{Binding SelectedPlugin}"
                              ItemsSource="{Binding PluginViewModels}"
                              Margin="6, 0, 0, 0" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                              ItemContainerStyle="{StaticResource PluginList}"
                              ScrollViewer.IsDeferredScrollingEnabled="True" ScrollViewer.CanContentScroll="False"
-                             Padding="0 0 0 18" Width="Auto" HorizontalAlignment="Stretch">
-
+                             Padding="0 0 0 0" Width="Auto" HorizontalAlignment="Stretch">
+                        <ListBox.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <StackPanel Margin="0,0,0,18"/>
+                            </ItemsPanelTemplate>
+                        </ListBox.ItemsPanel>
                         <ListBox.ItemTemplate>
                             <DataTemplate>
                                 <Expander Grid.Column="4" x:Name="expanderHeader"
@@ -734,83 +738,6 @@
                     </ListBox>
                 </Border>
 
-                <!--
-                <Border BorderThickness="1 2 0 0" BorderBrush="#f3f3f3" Grid.Column="2" Grid.RowSpan="2" Padding="12 12 12 12">
-                <Grid Grid.Column="1" Grid.RowSpan="2">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="*" />
-                    </Grid.RowDefinitions>
-                    
-                    <ContentControl DataContext="{Binding Path=SelectedPlugin}"
-                                    Grid.ColumnSpan="1" Grid.Row="0" Margin="10 10 10 0">
-                        <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="48" />
-                                <ColumnDefinition />
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition/>
-                                <RowDefinition/>
-                                <RowDefinition/>
-                            </Grid.RowDefinitions>
-                            
-                            <Image Source="{Binding Image, IsAsync=True}"
-                                   Width="48" Height="48" 
-                                   HorizontalAlignment="Left" VerticalAlignment="Top"
-                                   Grid.RowSpan="2"/>
-                            <Grid Grid.Row="0" Grid.Column="1"
-                                  Margin="20,0,0,0">
-                                <TextBlock Text="{Binding PluginPair.Metadata.Name}"
-                                            Grid.Column="0"
-                                            Cursor="Hand" MouseUp="OnPluginNameClick" FontSize="24"
-                                            HorizontalAlignment="Left">
-                                        <ToolTipService.ToolTip>
-                                            <TextBlock>
-                                                <Run Text="{DynamicResource author}" />
-                                                <Run Text=": " />
-                                                <Run Text="{Binding PluginPair.Metadata.Author}" />
-                                            </TextBlock>
-                                        </ToolTipService.ToolTip>
-                                    </TextBlock>
-                                <ui:ToggleSwitch Grid.Column="1" OffContent="{DynamicResource disable}" OnContent="{DynamicResource enable}" 
-                                                    MaxWidth="110" HorizontalAlignment="Right"
-                                                    IsOn="{Binding PluginState}"/>
-                            </Grid>
-                            <TextBlock Margin="20,0,0,0"
-                                       Text="{Binding PluginPair.Metadata.Description}"
-                                       Grid.Row="1" Opacity="0.5" Grid.Column="2" />
-                            <DockPanel Grid.ColumnSpan="2" Grid.Row="2" Margin="0 10 0 8" HorizontalAlignment="Right">
-                                <TextBlock Text="{DynamicResource priority}" Margin="15,0,0,0" MaxWidth="100"/>
-                                <TextBlock Text="{Binding Priority}"
-                                            ToolTip="Change Plugin Results Priority"
-                                            Margin="5 0 0 0" Cursor="Hand" Foreground="Blue"
-                                            MouseUp="OnPluginPriorityClick"/>
-                                <TextBlock Text="{DynamicResource actionKeywords}"
-                                            Visibility="{Binding ActionKeywordsVisibility}"
-                                            Margin="5 0 0 0"/>
-                                <TextBlock Text="{Binding ActionKeywordsText}"
-                                            Visibility="{Binding ActionKeywordsVisibility}"
-                                            ToolTip="Change Action Keywords"
-                                            Margin="5 0 0 0" Cursor="Hand" Foreground="Blue"
-                                            MouseUp="OnPluginActionKeywordsClick" MaxWidth="100" />
-                                <TextBlock Text="{DynamicResource plugin_init_time}" Margin="10 0 0 0" MaxWidth="100"/>
-                                <TextBlock Text="{Binding InitilizaTime}" Margin="5 0 0 0" MaxWidth="100"/>
-                                <TextBlock Text="{DynamicResource plugin_query_time}" Margin="10 0 0 0" MaxWidth="100"/>
-                                <TextBlock Text="{Binding QueryTime}" Margin="5 0 0 0" MaxWidth="100"/>
-                                <TextBlock Text="{DynamicResource pluginDirectory}"
-                                            MaxWidth="120" Cursor="Hand" Margin="10,0,0,0"
-                                            MouseUp="OnPluginDirecotyClick" Foreground="Blue" />
-                            </DockPanel>
-                        </Grid>
-                    </ContentControl>
-                    
-                    <ContentControl Content="{Binding SettingProvider}"
-                                    Grid.ColumnSpan="1" Grid.Row="1"
-                                    HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
-                </Grid>
-                </Border>
-                -->
             </Grid>
         </TabItem>