diff --git a/Flow.Launcher.Infrastructure/Storage/BinaryStorage.cs b/Flow.Launcher.Infrastructure/Storage/BinaryStorage.cs
index a679643fd..2a439b8cc 100644
--- a/Flow.Launcher.Infrastructure/Storage/BinaryStorage.cs
+++ b/Flow.Launcher.Infrastructure/Storage/BinaryStorage.cs
@@ -67,7 +67,7 @@ namespace Flow.Launcher.Infrastructure.Storage
             }
             catch (System.Exception e)
             {
-                Log.Exception($"|BinaryStorage.Deserialize|Deserialize error for file <{FilePath}>", e);
+                // Log.Exception($"|BinaryStorage.Deserialize|Deserialize error for file <{FilePath}>", e);
                 return defaultData;
             }
         }
diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index 6528f626c..458846665 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -88,8 +88,8 @@ namespace Flow.Launcher.Infrastructure.UserSettings
 
         public double SettingWindowWidth { get; set; } = 1000;
         public double SettingWindowHeight { get; set; } = 700;
-        public double SettingWindowTop { get; set; }
-        public double SettingWindowLeft { get; set; }
+        public double? SettingWindowTop { get; set; } = null;
+        public double? SettingWindowLeft { get; set; } = null;
         public System.Windows.WindowState SettingWindowState { get; set; } = WindowState.Normal;
 
         public int CustomExplorerIndex { get; set; } = 0;
diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj
index 53c1bafc7..848c52f1f 100644
--- a/Flow.Launcher/Flow.Launcher.csproj
+++ b/Flow.Launcher/Flow.Launcher.csproj
@@ -111,6 +111,12 @@
     </Content>
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="Resources\dev.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
     <Exec Command="taskkill /f /fi &quot;IMAGENAME eq Flow.Launcher.exe&quot;" />
   </Target>
diff --git a/Flow.Launcher/Images/dev.ico b/Flow.Launcher/Images/dev.ico
new file mode 100644
index 000000000..aba4eb2f9
Binary files /dev/null and b/Flow.Launcher/Images/dev.ico differ
diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index 2b10f79b3..e1970f5ba 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -344,8 +344,22 @@
                 <ContentControl>
                     <ContentControl.Style>
                         <Style TargetType="ContentControl">
-                            <Setter Property="Visibility" Value="Collapsed" />
+                            <Setter Property="Visibility" Value="Visible" />
                             <Style.Triggers>
+                                <MultiDataTrigger>
+                                    <MultiDataTrigger.Conditions>
+                                        <Condition Binding="{Binding ElementName=ResultListBox, Path=Items.Count}" Value="0" />
+                                        <Condition Binding="{Binding ElementName=ContextMenu, Path=Visibility}" Value="Collapsed" />
+                                        <Condition Binding="{Binding ElementName=History, Path=Visibility}" Value="Collapsed" />
+                                    </MultiDataTrigger.Conditions>
+                                    <MultiDataTrigger.Setters>
+                                        <Setter Property="Visibility" Value="Collapsed" />
+                                        <Setter Property="Margin" Value="0" />
+                                        <Setter Property="Height" Value="0" />
+                                    </MultiDataTrigger.Setters>
+                                </MultiDataTrigger>
+                            </Style.Triggers>
+                            <!--<Style.Triggers>
                                 <DataTrigger Binding="{Binding ElementName=ResultListBox, Path=Visibility}" Value="Visible">
                                     <Setter Property="Visibility" Value="Visible" />
                                 </DataTrigger>
@@ -355,7 +369,7 @@
                                 <DataTrigger Binding="{Binding ElementName=History, Path=Visibility}" Value="Visible">
                                     <Setter Property="Visibility" Value="Visible" />
                                 </DataTrigger>
-                            </Style.Triggers>
+                            </Style.Triggers>-->
                         </Style>
                     </ContentControl.Style>
                     <Rectangle
@@ -368,7 +382,7 @@
             </Grid>
             <Grid>
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" MinWidth="100" />
+                    <ColumnDefinition Width="*" MinWidth="80" />
                     <ColumnDefinition Width="Auto" />
                     <ColumnDefinition Width="0.85*" MinWidth="244" />
                 </Grid.ColumnDefinitions>
@@ -428,6 +442,7 @@
                 <GridSplitter
                     Grid.Column="1"
                     Width="{Binding PreviewVisible, Converter={StaticResource SplitterConverter}}"
+                    Margin="0"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Stretch"
                     Background="Transparent"
@@ -439,6 +454,7 @@
                     Style="{DynamicResource PreviewArea}"
                     Visibility="{Binding PreviewVisible, Converter={StaticResource BoolToVisibilityConverter}}">
                     <Border
+                        MinHeight="380"
                         d:DataContext="{d:DesignInstance vm:ResultViewModel}"
                         DataContext="{Binding SelectedItem, ElementName=ResultListBox}"
                         Style="{DynamicResource PreviewBorderStyle}"
@@ -514,6 +530,8 @@
                         </Grid>
                     </Border>
                     <Border
+                        MinHeight="380"
+                        MaxHeight="{Binding ElementName=ResultListBox, Path=ActualHeight}"
                         d:DataContext="{d:DesignInstance vm:ResultViewModel}"
                         DataContext="{Binding SelectedItem, ElementName=ResultListBox}"
                         Style="{DynamicResource PreviewBorderStyle}"
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index c333c4e85..22799a63d 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -85,15 +85,26 @@ namespace Flow.Launcher
 
         private const int WM_ENTERSIZEMOVE = 0x0231;
         private const int WM_EXITSIZEMOVE = 0x0232;
+        private int _initialWidth;
+        private int _initialHeight;
         private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
         {
             if (msg == WM_ENTERSIZEMOVE)
             {
+                _initialWidth = (int)Width;
+                _initialHeight = (int)Height;
                 handled = true;
             }
             if (msg == WM_EXITSIZEMOVE)
             {
-                OnResizeEnd();
+                if ( _initialHeight != (int)Height)
+                {
+                    OnResizeEnd();
+                }
+                if (_initialWidth != (int)Width)
+                {
+                    FlowMainWindow.SizeToContent = SizeToContent.Height;
+                }
                 handled = true;
             }
             return IntPtr.Zero;
@@ -120,9 +131,8 @@ namespace Flow.Launcher
                     _settings.MaxResultsToShow = Convert.ToInt32(Math.Truncate(itemCount));
                 }
             }
-
-            _viewModel.MainWindowWidth = Width;
             FlowMainWindow.SizeToContent = SizeToContent.Height;
+            _viewModel.MainWindowWidth = Width;
         }
 
         private void OnCopy(object sender, ExecutedRoutedEventArgs e)
@@ -169,7 +179,6 @@ namespace Flow.Launcher
         {
             // MouseEventHandler
             PreviewMouseMove += MainPreviewMouseMove;
-
             CheckFirstLaunch();
             HideStartup();
             // show notify icon when flowlauncher is hidden
@@ -332,11 +341,10 @@ namespace Flow.Launcher
             _notifyIcon = new NotifyIcon
             {
                 Text = Infrastructure.Constant.FlowLauncherFullName,
-                Icon = Properties.Resources.app,
+                Icon = Constant.Version == "1.0.0" ? Properties.Resources.dev : Properties.Resources.app,
                 Visible = !_settings.HideNotifyIcon
             };
 
-
             var openIcon = new FontIcon
             {
                 Glyph = "\ue71e"
diff --git a/Flow.Launcher/Properties/Resources.Designer.cs b/Flow.Launcher/Properties/Resources.Designer.cs
index 43927cb98..ce4d4fe13 100644
--- a/Flow.Launcher/Properties/Resources.Designer.cs
+++ b/Flow.Launcher/Properties/Resources.Designer.cs
@@ -77,5 +77,13 @@ namespace Flow.Launcher.Properties {
                 return ((System.Drawing.Icon)(obj));
             }
         }
+        internal static System.Drawing.Icon dev
+        {
+            get
+            {
+                object obj = ResourceManager.GetObject("dev", resourceCulture);
+                return ((System.Drawing.Icon)(obj));
+            }
+        }
     }
 }
diff --git a/Flow.Launcher/Properties/Resources.resx b/Flow.Launcher/Properties/Resources.resx
index 2126cb185..d608b69d5 100644
--- a/Flow.Launcher/Properties/Resources.resx
+++ b/Flow.Launcher/Properties/Resources.resx
@@ -112,15 +112,18 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="app" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\app.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="dev" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Images\dev.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="gamemode" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Images\gamemode.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
diff --git a/Flow.Launcher/Resources/dev.ico b/Flow.Launcher/Resources/dev.ico
new file mode 100644
index 000000000..5d06b9f28
Binary files /dev/null and b/Flow.Launcher/Resources/dev.ico differ
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 957379ce4..de4fd1f91 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -110,15 +110,15 @@ public partial class SettingWindow
 
     public void InitializePosition()
     {
-        if (_settings.SettingWindowTop == null)
+        if (_settings.SettingWindowTop == null || _settings.SettingWindowLeft == null)
         {
             Top = WindowTop();
             Left = WindowLeft();
         }
         else
         {
-            Top = _settings.SettingWindowTop;
-            Left = _settings.SettingWindowLeft;
+            Top = _settings.SettingWindowTop.Value;
+            Left = _settings.SettingWindowLeft.Value;
         }
         WindowState = _settings.SettingWindowState;
     }
diff --git a/Flow.Launcher/Themes/Base.xaml b/Flow.Launcher/Themes/Base.xaml
index 2ba3a5929..fe17bdbf5 100644
--- a/Flow.Launcher/Themes/Base.xaml
+++ b/Flow.Launcher/Themes/Base.xaml
@@ -28,8 +28,8 @@
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="FontSize" Value="28" />
         <Setter Property="FontWeight" Value="Regular" />
-        <Setter Property="Margin" Value="16,7,0,7" />
-        <Setter Property="Padding" Value="0,4,68,0" />
+        <Setter Property="Margin" Value="16 7 0 7" />
+        <Setter Property="Padding" Value="0 4 68 0" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Height" Value="48" />
         <Setter Property="Foreground" Value="#E3E0E3" />
@@ -69,7 +69,7 @@
 
     <!--  Further font customisations are dynamically loaded in Theme.cs  -->
     <Style x:Key="BaseQueryBoxBgStyle" TargetType="{x:Type Border}">
-        <Setter Property="Margin" Value="0,2,0,0" />
+        <Setter Property="Margin" Value="0 2 0 0" />
     </Style>
     <Style
         x:Key="QueryBoxBgStyle"
@@ -81,9 +81,9 @@
         TargetType="{x:Type TextBox}">
         <Setter Property="Foreground" Value="DarkGray" />
         <Setter Property="Height" Value="48" />
-        <Setter Property="Margin" Value="16,7,0,7" />
+        <Setter Property="Margin" Value="16 7 0 7" />
         <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Padding" Value="0,4,68,0" />
+        <Setter Property="Padding" Value="0 4 68 0" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="VerticalAlignment" Value="Center" />
     </Style>
@@ -91,7 +91,7 @@
     <Style x:Key="BaseWindowBorderStyle" TargetType="{x:Type Border}">
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="Background" Value="#2F2F2F" />
-        <Setter Property="Padding" Value="0,0,0,0" />
+        <Setter Property="Padding" Value="0 0 0 0" />
         <Setter Property="CornerRadius" Value="5" />
         <Setter Property="UseLayoutRounding" Value="True" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -115,7 +115,7 @@
         <Setter Property="HorizontalAlignment" Value="Right" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="Height" Value="Auto" />
-        <Setter Property="Margin" Value="0,0,66,0" />
+        <Setter Property="Margin" Value="0 0 66 0" />
         <Setter Property="Visibility" Value="Collapsed" />
     </Style>
     <Style x:Key="BaseClockBox" TargetType="{x:Type TextBlock}">
@@ -123,7 +123,7 @@
         <Setter Property="Foreground" Value="#8f8f8f" />
         <Setter Property="HorizontalAlignment" Value="Right" />
         <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="Margin" Value="0,0,0,0" />
+        <Setter Property="Margin" Value="0 0 0 0" />
         <Style.Triggers>
             <DataTrigger Binding="{Binding ElementName=DateBox, Path=Visibility}" Value="Visible">
                 <Setter Property="FontSize" Value="14" />
@@ -135,7 +135,7 @@
         <Setter Property="Foreground" Value="#8f8f8f" />
         <Setter Property="HorizontalAlignment" Value="Right" />
         <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="Margin" Value="0,0,0,0" />
+        <Setter Property="Margin" Value="0 0 0 0" />
         <Style.Triggers>
             <DataTrigger Binding="{Binding ElementName=ClockBox, Path=Visibility}" Value="Visible">
                 <Setter Property="FontSize" Value="14" />
@@ -188,7 +188,7 @@
     <!--  Item Style  -->
     <Style x:Key="ProgressBarResult" TargetType="{x:Type ProgressBar}">
         <Setter Property="Height" Value="18" />
-        <Setter Property="Margin" Value="0,0,0,4" />
+        <Setter Property="Margin" Value="0 0 0 4" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="Maximum" Value="100" />
         <Setter Property="Minimum" Value="0" />
@@ -214,7 +214,7 @@
     <Style x:Key="BaseItemNumberStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalAlignment" Value="Center" />
-        <Setter Property="Margin" Value="3,0,0,0" />
+        <Setter Property="Margin" Value="3 0 0 0" />
         <Setter Property="FontSize" Value="22" />
     </Style>
     <Style x:Key="BaseGlyphStyle" TargetType="{x:Type TextBlock}">
@@ -255,7 +255,7 @@
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
         <Setter Property="Margin" Value="{DynamicResource ResultMargin}" />
-        <Setter Property="Padding" Value="0,0,0,0" />
+        <Setter Property="Padding" Value="0 0 0 0" />
 
         <Setter Property="Template">
             <Setter.Value>
@@ -265,12 +265,12 @@
                             <Style TargetType="ScrollViewer">
                                 <Style.Triggers>
                                     <Trigger Property="ComputedVerticalScrollBarVisibility" Value="Visible">
-                                        <Setter Property="Margin" Value="0,0,0,0" />
-                                        <Setter Property="Padding" Value="0,0,0,0" />
+                                        <Setter Property="Margin" Value="0 0 0 0" />
+                                        <Setter Property="Padding" Value="0 0 0 0" />
                                     </Trigger>
                                     <Trigger Property="ComputedVerticalScrollBarVisibility" Value="Collapsed">
-                                        <Setter Property="Margin" Value="0,0,0,0" />
-                                        <Setter Property="Padding" Value="0,0,0,0" />
+                                        <Setter Property="Margin" Value="0 0 0 0" />
+                                        <Setter Property="Padding" Value="0 0 0 0" />
                                     </Trigger>
                                 </Style.Triggers>
                             </Style>
@@ -312,7 +312,7 @@
                 x:Name="PART_VerticalScrollBar"
                 Grid.Row="0"
                 Grid.Column="0"
-                Margin="0,0,0,0"
+                Margin="0 0 0 0"
                 HorizontalAlignment="Right"
                 AutomationProperties.AutomationId="VerticalScrollBar"
                 Cursor="Arrow"
@@ -368,22 +368,7 @@
             </Setter.Value>
         </Setter>
     </Style>
-    <Style x:Key="BaseSeparatorStyle" TargetType="Rectangle">
-        <Style.Triggers>
-            <MultiDataTrigger>
-                <MultiDataTrigger.Conditions>
-                    <Condition Binding="{Binding ElementName=ResultListBox, Path=Items.Count}" Value="0" />
-                    <Condition Binding="{Binding ElementName=ContextMenu, Path=Visibility}" Value="Collapsed" />
-                    <Condition Binding="{Binding ElementName=History, Path=Visibility}" Value="Collapsed" />
-                </MultiDataTrigger.Conditions>
-                <MultiDataTrigger.Setters>
-                    <Setter Property="Visibility" Value="Collapsed" />
-                    <Setter Property="Margin" Value="0" />
-                    <Setter Property="Height" Value="0" />
-                </MultiDataTrigger.Setters>
-            </MultiDataTrigger>
-        </Style.Triggers>
-    </Style>
+    <Style x:Key="BaseSeparatorStyle" TargetType="Rectangle" />
     <Style x:Key="HighlightStyle">
         <Setter Property="Inline.FontWeight" Value="Bold" />
     </Style>
@@ -413,15 +398,15 @@
     <Style x:Key="BaseSearchIconPosition" TargetType="{x:Type Canvas}">
         <Setter Property="Width" Value="32" />
         <Setter Property="Height" Value="32" />
-        <Setter Property="Margin" Value="0,2,18,0" />
+        <Setter Property="Margin" Value="0 2 18 0" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="HorizontalAlignment" Value="Right" />
     </Style>
     <Style x:Key="BasePreviewBorderStyle" TargetType="{x:Type Border}">
-        <Setter Property="BorderThickness" Value="1,0,0,0" />
+        <Setter Property="BorderThickness" Value="1 0 0 0" />
         <Setter Property="BorderBrush" Value="#FFEAEAEA" />
         <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Margin" Value="0,0,10,10" />
+        <Setter Property="Margin" Value="0 0 10 10" />
     </Style>
     <Style x:Key="BasePreviewGlyph" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#555555" />
@@ -447,7 +432,7 @@
     <Style x:Key="PreviewSep" TargetType="{x:Type Separator}">
         <Setter Property="Visibility" Value="Visible" />
         <Setter Property="Background" Value="{Binding ElementName=MiddleSeparator, Path=Fill}" />
-        <Setter Property="Margin" Value="0,15,0,5" />
+        <Setter Property="Margin" Value="0 15 0 5" />
         <Style.Triggers>
             <DataTrigger Binding="{Binding ElementName=PreviewSubTitle, UpdateSourceTrigger=PropertyChanged, Path=Text.Length}" Value="0">
                 <Setter Property="Visibility" Value="Collapsed" />
@@ -483,7 +468,7 @@
     <Style x:Key="PluginActivationIcon" TargetType="{x:Type Image}">
         <Setter Property="Width" Value="32" />
         <Setter Property="Height" Value="32" />
-        <Setter Property="Margin" Value="0,0,18,0" />
+        <Setter Property="Margin" Value="0 0 18 0" />
         <Setter Property="VerticalAlignment" Value="Center" />
     </Style>
 
@@ -495,7 +480,7 @@
     <Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
         <Setter Property="Width" Value="32" />
         <Setter Property="Height" Value="32" />
-        <Setter Property="Margin" Value="0,2,18,0" />
+        <Setter Property="Margin" Value="0 2 18 0" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="HorizontalAlignment" Value="Right" />
     </Style>
@@ -503,7 +488,7 @@
         x:Key="ClockPanelPosition"
         BasedOn="{StaticResource BaseClockPanelPosition}"
         TargetType="{x:Type Canvas}">
-        <Setter Property="Margin" Value="0,2,66,0" />
+        <Setter Property="Margin" Value="0 2 66 0" />
     </Style>
     <Style
         x:Key="ItemHotkeyStyle"
@@ -536,7 +521,7 @@
     <Style x:Key="BasePreviewItemTitleStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#8f8f8f" />
         <Setter Property="FontSize" Value="15" />
-        <Setter Property="Margin" Value="0,6,0,0" />
+        <Setter Property="Margin" Value="0 6 0 0" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="TextAlignment" Value="Center" />
         <Setter Property="TextWrapping" Value="Wrap" />
@@ -545,7 +530,7 @@
         <Setter Property="Foreground" Value="#8f8f8f" />
         <Setter Property="FontSize" Value="12" />
         <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="Margin" Value="0,6,0,10" />
+        <Setter Property="Margin" Value="0 6 0 10" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="LineHeight" Value="18" />
         <Setter Property="TextAlignment" Value="Left" />
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index dcca3fb1a..90f1070b4 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -143,15 +143,21 @@ namespace Flow.Launcher.ViewModel
 
             ContextMenu = new ResultsViewModel(Settings)
             {
-                LeftClickResultCommand = OpenResultCommand, RightClickResultCommand = LoadContextMenuCommand
+                LeftClickResultCommand = OpenResultCommand,
+                RightClickResultCommand = LoadContextMenuCommand,
+                IsPreviewOn = Settings.AlwaysPreview
             };
             Results = new ResultsViewModel(Settings)
             {
-                LeftClickResultCommand = OpenResultCommand, RightClickResultCommand = LoadContextMenuCommand
+                LeftClickResultCommand = OpenResultCommand,
+                RightClickResultCommand = LoadContextMenuCommand,
+                IsPreviewOn = Settings.AlwaysPreview
             };
             History = new ResultsViewModel(Settings)
             {
-                LeftClickResultCommand = OpenResultCommand, RightClickResultCommand = LoadContextMenuCommand
+                LeftClickResultCommand = OpenResultCommand,
+                RightClickResultCommand = LoadContextMenuCommand,
+                IsPreviewOn = Settings.AlwaysPreview
             };
             _selectedResults = Results;
 
@@ -586,6 +592,10 @@ namespace Flow.Launcher.ViewModel
             {
                 HidePreview();
             }
+
+            ContextMenu.IsPreviewOn = PreviewVisible;
+            History.IsPreviewOn = PreviewVisible;
+            Results.IsPreviewOn = PreviewVisible;
         }
 
         private void ShowPreview()
diff --git a/Flow.Launcher/ViewModel/ResultsViewModel.cs b/Flow.Launcher/ViewModel/ResultsViewModel.cs
index 68e59009f..107372e01 100644
--- a/Flow.Launcher/ViewModel/ResultsViewModel.cs
+++ b/Flow.Launcher/ViewModel/ResultsViewModel.cs
@@ -1,4 +1,5 @@
-using Flow.Launcher.Infrastructure.UserSettings;
+using System;
+using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
 using System.Collections.Generic;
 using System.Collections.Specialized;
@@ -49,7 +50,25 @@ namespace Flow.Launcher.ViewModel
 
         #region Properties
 
-        public double MaxHeight => MaxResults * _settings.ItemHeightSize;
+        public bool IsPreviewOn { get; set; }
+
+        public double MaxHeight
+        {
+            get
+            {
+                var newResultsCount = MaxResults;
+                if (IsPreviewOn)
+                {
+                    newResultsCount = (int)Math.Ceiling(380 / _settings.ItemHeightSize);
+                    if (newResultsCount < MaxResults)
+                    {
+                        newResultsCount = MaxResults;
+                    }
+                }
+                return newResultsCount * _settings.ItemHeightSize;
+            }
+        }
+
         public double ItemHeightSize
         {
             get => _settings.ItemHeightSize;
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index 481802045..04dd6312b 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -52,13 +52,13 @@ public class SettingWindowViewModel : BaseModel
         set => Settings.SettingWindowHeight = value;
     }
 
-    public double SettingWindowTop
+    public double? SettingWindowTop
     {
         get => Settings.SettingWindowTop;
         set => Settings.SettingWindowTop = value;
     }
 
-    public double SettingWindowLeft
+    public double? SettingWindowLeft
     {
         get => Settings.SettingWindowLeft;
         set => Settings.SettingWindowLeft = value;
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml
index b5cfd1a5d..e81340de6 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml
@@ -13,37 +13,41 @@
         Margin="20 0 10 0"
         VerticalAlignment="Stretch">
         <Grid.RowDefinitions>
-            <RowDefinition Height="*" />
+            <RowDefinition />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
-        <StackPanel Grid.Row="0" VerticalAlignment="Center">
+        <Grid Grid.Row="0" VerticalAlignment="Center">
+            <Grid.RowDefinitions>
+                <RowDefinition MinHeight="96" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
             <Image
-                Margin="0 16 0 0"
-                HorizontalAlignment="Stretch"
-                Source="{Binding PreviewImage, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"
-                StretchDirection="DownOnly">
+                Grid.Row="0"
+                Margin="0 12 0 0"
+                Source="{Binding PreviewImage, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}">
                 <Image.Style>
                     <Style TargetType="Image">
-                        <Setter Property="MaxWidth" Value="96" />
-                        <Setter Property="MaxHeight" Value="320" />
                         <Style.Triggers>
-                            <DataTrigger Binding="{Binding UseBigThumbnail}" Value="True">
-                                <Setter Property="MaxWidth" Value="{Binding ElementName=PreviewGrid, Path=ActualWidth}" />
-                                <Setter Property="MaxHeight" Value="{Binding ElementName=PreviewGrid, Path=ActualHeight}" />
+                            <DataTrigger Binding="{Binding UseBigThumbnail}" Value="False">
+                                <Setter Property="MaxWidth" Value="96" />
+                                <Setter Property="MaxHeight" Value="96" />
                             </DataTrigger>
                         </Style.Triggers>
                     </Style>
                 </Image.Style>
             </Image>
-            <TextBlock
-                Margin="0 6 0 16"
-                HorizontalAlignment="Stretch"
-                Style="{DynamicResource PreviewItemTitleStyle}"
-                Text="{Binding Result.Title}"
-                TextAlignment="Center"
-                TextWrapping="Wrap" />
-        </StackPanel>
-        <StackPanel Grid.Row="1">
+            <Grid Grid.Row="1">
+                <TextBlock
+                    Margin="0 6 0 16"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Top"
+                    Style="{DynamicResource PreviewItemTitleStyle}"
+                    Text="{Binding Result.Title}"
+                    TextAlignment="Center"
+                    TextWrapping="Wrap" />
+            </Grid>
+        </Grid>
+        <StackPanel Grid.Row="2">
             <StackPanel.Style>
                 <Style TargetType="StackPanel">
                     <Style.Triggers>
@@ -53,10 +57,22 @@
                     </Style.Triggers>
                 </Style>
             </StackPanel.Style>
-            <Separator />
-            <TextBlock Style="{DynamicResource PreviewItemSubTitleStyle}" Text="{Binding Result.SubTitle}" />
+            <Rectangle
+                Width="Auto"
+                Margin="0 0 0 0"
+                HorizontalAlignment="Stretch"
+                Style="{DynamicResource SeparatorStyle}" />
+            <TextBlock
+                Margin="0 8 0 8"
+                Style="{DynamicResource PreviewItemSubTitleStyle}"
+                Text="{Binding Result.SubTitle}" />
+            <Rectangle
+                Width="Auto"
+                Margin="0 0 0 0"
+                HorizontalAlignment="Stretch"
+                Style="{DynamicResource SeparatorStyle}" />
             <StackPanel Visibility="{Binding FileInfoVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}">
-                <Grid Margin="0 10 0 0">
+                <Grid Margin="0 10 0 10">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="100" />
                         <ColumnDefinition Width="*" />
@@ -70,7 +86,7 @@
                     <TextBlock
                         Grid.Row="0"
                         Grid.Column="0"
-                        Margin="0 0 8 0"
+                        Margin="0 0 0 0"
                         VerticalAlignment="Top"
                         Style="{DynamicResource PreviewItemSubTitleStyle}"
                         Text="{DynamicResource FileSize}"
diff --git a/README.md b/README.md
index 858d39d1c..866cdf8b3 100644
--- a/README.md
+++ b/README.md
@@ -121,7 +121,7 @@ Or download the [early access version](https://github.com/Flow-Launcher/Prerelea
 
 <img src="https://user-images.githubusercontent.com/6903107/207159486-1993510f-09f2-4e33-bba7-4ca59ca1bc5a.png" width="500">
 
-- Drag a file/folder to File Exlporer, or even Discord.
+- Drag a file/folder to File Explorer, or even Discord.
 - Copy/move behavior can be change via <kbd>Ctrl</kbd> or <kbd>Shift</kbd>, and the operation is displayed on the mouse cursor.
 
 ### Windows & Control Panel Settings