diff --git a/Advanced PassGen/Advanced PassGen.csproj b/Advanced PassGen/Advanced PassGen.csproj
index 865c00b..648cd1e 100644
--- a/Advanced PassGen/Advanced PassGen.csproj	
+++ b/Advanced PassGen/Advanced PassGen.csproj	
@@ -130,7 +130,6 @@
   <ItemGroup>
     <Resource Include="Resources\Images\advanced.png" />
     <Resource Include="Resources\Images\general.png" />
-    <Resource Include="Resources\Images\generator.png" />
     <Resource Include="Resources\Images\list.png" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Advanced PassGen/App.xaml.cs b/Advanced PassGen/App.xaml.cs
index 00af430..cd8112a 100644
--- a/Advanced PassGen/App.xaml.cs	
+++ b/Advanced PassGen/App.xaml.cs	
@@ -1,16 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows;
-
-namespace Advanced_PassGen
+namespace Advanced_PassGen
 {
     /// <summary>
     /// Interaction logic for App.xaml
     /// </summary>
-    public partial class App : Application
+    public partial class App
     {
     }
 }
diff --git a/Advanced PassGen/Properties/Resources.Designer.cs b/Advanced PassGen/Properties/Resources.Designer.cs
index 1eaf4f3..5d871fa 100644
--- a/Advanced PassGen/Properties/Resources.Designer.cs	
+++ b/Advanced PassGen/Properties/Resources.Designer.cs	
@@ -110,16 +110,6 @@ internal static System.Drawing.Bitmap general {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap generator {
-            get {
-                object obj = ResourceManager.GetObject("generator", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
diff --git a/Advanced PassGen/Properties/Resources.resx b/Advanced PassGen/Properties/Resources.resx
index e480748..223551c 100644
--- a/Advanced PassGen/Properties/Resources.resx	
+++ b/Advanced PassGen/Properties/Resources.resx	
@@ -133,9 +133,6 @@
   <data name="general" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Images\general.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="generator" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images\generator.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="list" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Images\list.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
diff --git a/Advanced PassGen/Resources/Images/generator.png b/Advanced PassGen/Resources/Images/generator.png
deleted file mode 100644
index 7c3acd7..0000000
Binary files a/Advanced PassGen/Resources/Images/generator.png and /dev/null differ
diff --git a/Advanced PassGen/Windows/MainWindow.xaml b/Advanced PassGen/Windows/MainWindow.xaml
index f93dccf..bdd7c12 100644
--- a/Advanced PassGen/Windows/MainWindow.xaml	
+++ b/Advanced PassGen/Windows/MainWindow.xaml	
@@ -6,7 +6,7 @@
                              xmlns:syncfusion="http://schemas.syncfusion.com/wpf"
                              mc:Ignorable="d"
                              AllowsTransparency="True"
-                             Title="Advanced PassGen" WindowStartupLocation="CenterScreen" Icon="/Advanced PassGen;component/key.ico" Width="400" Height="300" TitleTextAlignment="Center">
+                             Title="Advanced PassGen" WindowStartupLocation="CenterScreen" Icon="/Advanced PassGen;component/key.ico" Width="350" Height="250" TitleTextAlignment="Center">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition></RowDefinition>
@@ -94,9 +94,6 @@
                     </GroupBox>
                 </Grid>
             </syncfusion:TabItemExt>
-            <syncfusion:TabItemExt Header="Generator" Image="../Resources/Images/generator.png" ImageHeight="16" ImageWidth="16" >
-                <Button x:Name="BtnGenerate" Width="100" Height="25" Content="Generate" Click="BtnGenerate_Click"></Button>
-            </syncfusion:TabItemExt>
             <syncfusion:TabItemExt Header="List" Image="../Resources/Images/list.png" ImageHeight="16" ImageWidth="16" >
                 <Grid>
                     <Grid.RowDefinitions>
@@ -140,7 +137,14 @@
                             </GridView>
                         </ListView.View>
                     </ListView>
-                    <Button x:Name="BtnExport" Height="25" Grid.Row="1" Content=" Export" Margin="0" Click="BtnExport_Click" ></Button>
+                    <Grid Grid.Row="1">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition></ColumnDefinition>
+                            <ColumnDefinition></ColumnDefinition>
+                        </Grid.ColumnDefinitions>
+                        <Button x:Name="BtnGenerate" Content="Generate" Click="BtnGenerate_Click"></Button>
+                        <Button x:Name="BtnExport" Grid.Column="1" Content=" Export" Click="BtnExport_Click" ></Button>
+                    </Grid>
                 </Grid>
             </syncfusion:TabItemExt>
         </syncfusion:TabControlExt>
diff --git a/Advanced PassGen/Windows/MainWindow.xaml.cs b/Advanced PassGen/Windows/MainWindow.xaml.cs
index d8870e7..3340c7b 100644
--- a/Advanced PassGen/Windows/MainWindow.xaml.cs	
+++ b/Advanced PassGen/Windows/MainWindow.xaml.cs	
@@ -168,7 +168,6 @@ private async void BtnGenerate_Click(object sender, RoutedEventArgs e)
             {
                 LsvPasswordList.Items.Add(s);
             }
-            TceTabs.SelectedIndex = 3;
         }
 
         private void BtnExport_Click(object sender, RoutedEventArgs e)
@@ -180,6 +179,7 @@ private void BtnExport_Click(object sender, RoutedEventArgs e)
             if (res != true) return;
             try
             {
+                // ReSharper disable once SwitchStatementMissingSomeCases
                 switch (sfd.FilterIndex)
                 {
                     case 1: