diff --git a/Wox/MainWindow.xaml b/Wox/MainWindow.xaml
index 519dc0a9ce..488ed99909 100644
--- a/Wox/MainWindow.xaml
+++ b/Wox/MainWindow.xaml
@@ -13,15 +13,10 @@
         Icon="Images\app.png"
         >
     <Border Style="{DynamicResource WindowBorderStyle}" MouseDown="Border_OnMouseDown">
-        <Grid x:Name="grid" >
-            <Grid.RowDefinitions>
-                <RowDefinition ></RowDefinition>
-                <RowDefinition></RowDefinition>
-                <RowDefinition></RowDefinition>
-            </Grid.RowDefinitions>
+        <StackPanel Orientation="Vertical">
             <TextBox Style="{DynamicResource QueryBoxStyle}" Grid.Row="0"  x:Name="tbQuery" PreviewKeyDown="TbQuery_OnPreviewKeyDown" TextChanged="TextBoxBase_OnTextChanged" />
             <Line Style="{DynamicResource PendingLineStyle}" x:Name="progressBar" Y1="0" Y2="0" X2="100" Grid.Row="1" Height="2" StrokeThickness="1"></Line>
             <wox:ResultPanel x:Name="resultCtrl" Grid.Row="2"/>
-        </Grid>
+        </StackPanel>
     </Border>
 </Window>
\ No newline at end of file
diff --git a/Wox/ResultPanel.xaml b/Wox/ResultPanel.xaml
index 66860283d6..0ee4433781 100644
--- a/Wox/ResultPanel.xaml
+++ b/Wox/ResultPanel.xaml
@@ -4,56 +4,54 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:wox="clr-namespace:Wox"
-             mc:Ignorable="d"
-             d:DesignHeight="300" d:DesignWidth="300">
+             mc:Ignorable="d" d:DesignWidth="100" d:DesignHeight="100"
+             >
     <UserControl.Resources>
         <wox:ImagePathConverter x:Key="ImagePathConverter"/>
     </UserControl.Resources>
 
-    <Grid x:Name="gridContainer">
-        <!-- set max height of listbox to allow 6 results showed at once -->
-        <ListBox x:Name="lbResults" MaxHeight="300" PreviewMouseDown="LbResults_OnPreviewMouseDown" Style="{DynamicResource BaseListboxStyle}" SelectionChanged ="lbResults_SelectionChanged"  Focusable="False"  KeyboardNavigation.DirectionalNavigation="Cycle" SelectionMode="Single" VirtualizingStackPanel.IsVirtualizing="True" VirtualizingStackPanel.VirtualizationMode="Standard">
-            <ListBox.Resources>
-                <!--SelectedItem with focus-->
-                <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="{DynamicResource ItemSelectedBackgroundColor}"/>
-                <!--SelectedItem without focus-->
-                <SolidColorBrush x:Key="{x:Static SystemColors.ControlBrushKey}" Color="{DynamicResource ItemSelectedBackgroundColor}"/>
-            </ListBox.Resources>
-            <ListBox.ItemTemplate>
-                <DataTemplate>
-                    <!-- a result item height is 50 including margin -->
-                    <Grid HorizontalAlignment="Stretch" Height="40" VerticalAlignment="Stretch" Margin="5"  Cursor="Hand">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="32"></ColumnDefinition>
-                            <ColumnDefinition/>
-                        </Grid.ColumnDefinitions>
-                        <Image x:Name="imgIco" Width="32" Height="32" HorizontalAlignment="Left" >
-                            <Image.Source>
-                                <MultiBinding Converter="{StaticResource ImagePathConverter}">
-                                    <MultiBinding.Bindings>
-                                        <Binding Path="IcoPath" />
-                                        <Binding Path="PluginDirectory" />
-                                    </MultiBinding.Bindings>
-                                </MultiBinding>
-                            </Image.Source>
-                        </Image>
-                        <Grid Margin="5 0 5 0" Grid.Column="1" HorizontalAlignment="Stretch">
-                            <Grid.RowDefinitions>
-                                <RowDefinition></RowDefinition>
-                                <RowDefinition Height="Auto" x:Name="SubTitleRowDefinition"></RowDefinition>
-                            </Grid.RowDefinitions>
-                            <TextBlock Style="{DynamicResource ItemTitleStyle}" VerticalAlignment="Center" ToolTip="{Binding Title}" x:Name="tbTitle" Text="{Binding Title}"></TextBlock>
-                            <TextBlock Style="{DynamicResource ItemSubTitleStyle}" ToolTip="{Binding SubTitle}" Visibility="{Binding SubTitle, Converter={wox:StringNullOrEmptyToVisibilityConverter}}" Grid.Row="1" x:Name="tbSubTitle" Text="{Binding SubTitle}"></TextBlock>
-                        </Grid>
+    <!-- set max height of listbox to allow 6 results showed at once -->
+    <ListBox x:Name="lbResults" MaxHeight="300" PreviewMouseDown="LbResults_OnPreviewMouseDown" Style="{DynamicResource BaseListboxStyle}" SelectionChanged ="lbResults_SelectionChanged"  Focusable="False"  KeyboardNavigation.DirectionalNavigation="Cycle" SelectionMode="Single" VirtualizingStackPanel.IsVirtualizing="True" VirtualizingStackPanel.VirtualizationMode="Standard">
+        <ListBox.Resources>
+            <!--SelectedItem with focus-->
+            <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="{DynamicResource ItemSelectedBackgroundColor}"/>
+            <!--SelectedItem without focus-->
+            <SolidColorBrush x:Key="{x:Static SystemColors.ControlBrushKey}" Color="{DynamicResource ItemSelectedBackgroundColor}"/>
+        </ListBox.Resources>
+        <ListBox.ItemTemplate>
+            <DataTemplate>
+                <!-- a result item height is 50 including margin -->
+                <Grid HorizontalAlignment="Stretch" Height="40" VerticalAlignment="Stretch" Margin="5"  Cursor="Hand">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="32"></ColumnDefinition>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <Image x:Name="imgIco" Width="32" Height="32" HorizontalAlignment="Left" >
+                        <Image.Source>
+                            <MultiBinding Converter="{StaticResource ImagePathConverter}">
+                                <MultiBinding.Bindings>
+                                    <Binding Path="IcoPath" />
+                                    <Binding Path="PluginDirectory" />
+                                </MultiBinding.Bindings>
+                            </MultiBinding>
+                        </Image.Source>
+                    </Image>
+                    <Grid Margin="5 0 5 0" Grid.Column="1" HorizontalAlignment="Stretch">
+                        <Grid.RowDefinitions>
+                            <RowDefinition></RowDefinition>
+                            <RowDefinition Height="Auto" x:Name="SubTitleRowDefinition"></RowDefinition>
+                        </Grid.RowDefinitions>
+                        <TextBlock Style="{DynamicResource ItemTitleStyle}" VerticalAlignment="Center" ToolTip="{Binding Title}" x:Name="tbTitle" Text="{Binding Title}"></TextBlock>
+                        <TextBlock Style="{DynamicResource ItemSubTitleStyle}" ToolTip="{Binding SubTitle}" Visibility="{Binding SubTitle, Converter={wox:StringNullOrEmptyToVisibilityConverter}}" Grid.Row="1" x:Name="tbSubTitle" Text="{Binding SubTitle}"></TextBlock>
                     </Grid>
-                    <DataTemplate.Triggers>
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ListBoxItem}}, Path=IsSelected}" Value="True">
-                            <Setter TargetName="tbTitle" Property="Style" Value="{DynamicResource ItemTitleSelectedStyle}"/>
-                            <Setter TargetName="tbSubTitle" Property="Style" Value="{DynamicResource ItemSubTitleSelectedStyle}"/>
-                        </DataTrigger>
-                    </DataTemplate.Triggers>
-                </DataTemplate>
-            </ListBox.ItemTemplate>
-        </ListBox>
-    </Grid>
+                </Grid>
+                <DataTemplate.Triggers>
+                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ListBoxItem}}, Path=IsSelected}" Value="True">
+                        <Setter TargetName="tbTitle" Property="Style" Value="{DynamicResource ItemTitleSelectedStyle}"/>
+                        <Setter TargetName="tbSubTitle" Property="Style" Value="{DynamicResource ItemSubTitleSelectedStyle}"/>
+                    </DataTrigger>
+                </DataTemplate.Triggers>
+            </DataTemplate>
+        </ListBox.ItemTemplate>
+    </ListBox>
 </UserControl>
\ No newline at end of file
diff --git a/Wox/ResultPanel.xaml.cs b/Wox/ResultPanel.xaml.cs
index 1afa90061e..2a07aaba82 100644
--- a/Wox/ResultPanel.xaml.cs
+++ b/Wox/ResultPanel.xaml.cs
@@ -39,7 +39,7 @@ namespace Wox
                 int position = GetInsertLocation(result.Score);
                 lbResults.Items.Insert(position, result);
             }
-            gridContainer.Margin = lbResults.Items.Count > 0 ? new Thickness { Top = 8 } : new Thickness { Top = 0 };
+            lbResults.Margin = lbResults.Items.Count > 0 ? new Thickness { Top = 8 } : new Thickness { Top = 0 };
             SelectFirst();
         }
 
@@ -150,7 +150,7 @@ namespace Wox
         public void Clear()
         {
             lbResults.Items.Clear();
-            gridContainer.Margin = new Thickness { Top = 0 };
+            lbResults.Margin = new Thickness { Top = 0 };
         }
 
         private void lbResults_SelectionChanged(object sender, SelectionChangedEventArgs e)
diff --git a/Wox/Themes/Default.xaml b/Wox/Themes/Default.xaml
index b11b3c532c..8584b46d38 100644
--- a/Wox/Themes/Default.xaml
+++ b/Wox/Themes/Default.xaml
@@ -20,7 +20,6 @@
         <Setter Property="Padding" Value="8 10 8 8" />
     </Style>
     <Style x:Key="BaseWindowStyle" TargetType="{x:Type Window}">
-        <Setter Property="Height" Value="80" />
         <Setter Property="Width" Value="500" />
     </Style>