diff --git a/ModernKeePass/BundleArtifacts/neutral.txt b/ModernKeePass/BundleArtifacts/neutral.txt
index ec956f7..161dcae 100644
--- a/ModernKeePass/BundleArtifacts/neutral.txt
+++ b/ModernKeePass/BundleArtifacts/neutral.txt
@@ -1,4 +1,4 @@
-MainPackage=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\bin\Release\ModernKeePass_1.5.0.20_AnyCPU.appx
-SymbolPackage=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\AppPackages\ModernKeePass_1.5.0.20_Test\ModernKeePass_1.5.0.20_AnyCPU.appxsym
-ResourcePack=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\bin\Release\ModernKeePass_1.5.0.20_scale-140.appx
-ResourcePack=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\bin\Release\ModernKeePass_1.5.0.20_scale-180.appx
+MainPackage=C:\Users\bg45\source\repos\ModernKeePass\ModernKeePass\bin\Release\ModernKeePass_1.5.0.25_AnyCPU.appx
+SymbolPackage=C:\Users\bg45\source\repos\ModernKeePass\ModernKeePass\AppPackages\ModernKeePass_1.5.0.25_Test\ModernKeePass_1.5.0.25_AnyCPU.appxsym
+ResourcePack=C:\Users\bg45\source\repos\ModernKeePass\ModernKeePass\bin\Release\ModernKeePass_1.5.0.25_scale-140.appx
+ResourcePack=C:\Users\bg45\source\repos\ModernKeePass\ModernKeePass\bin\Release\ModernKeePass_1.5.0.25_scale-180.appx
diff --git a/ModernKeePass/ModernKeePass.csproj b/ModernKeePass/ModernKeePass.csproj
index 7000edb..ab87ed5 100644
--- a/ModernKeePass/ModernKeePass.csproj
+++ b/ModernKeePass/ModernKeePass.csproj
@@ -20,6 +20,7 @@
     <PackageCertificateThumbprint>ED3AA34F46D03498F989901C5DB2742B65D72F60</PackageCertificateThumbprint>
     <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
     <AppxBundlePlatforms>neutral</AppxBundlePlatforms>
+    <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
diff --git a/ModernKeePass/Package.appxmanifest b/ModernKeePass/Package.appxmanifest
index edc0bd6..88a5046 100644
--- a/ModernKeePass/Package.appxmanifest
+++ b/ModernKeePass/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest">
-  <Identity Name="wismna.ModernKeePass" Publisher="CN=0719A91A-C322-4EE0-A257-E60733EECF06" Version="1.5.0.20" />
+  <Identity Name="wismna.ModernKeePass" Publisher="CN=0719A91A-C322-4EE0-A257-E60733EECF06" Version="1.5.0.25" />
   <Properties>
     <DisplayName>ModernKeePass</DisplayName>
     <PublisherDisplayName>wismna</PublisherDisplayName>
diff --git a/ModernKeePass/Pages/EntryDetailPage.xaml b/ModernKeePass/Pages/EntryDetailPage.xaml
index 5a93cbc..5802291 100644
--- a/ModernKeePass/Pages/EntryDetailPage.xaml
+++ b/ModernKeePass/Pages/EntryDetailPage.xaml
@@ -379,13 +379,13 @@
                         </core:EventTriggerBehavior>
                     </interactivity:Interaction.Behaviors>
                 </AppBarButton>
-                <AppBarButton Icon="Setting" Label="Settings">
+                <!--<AppBarButton Icon="Setting" Label="Settings">
                     <interactivity:Interaction.Behaviors>
                         <core:EventTriggerBehavior EventName="Click">
                             <core:NavigateToPageAction TargetPage="ModernKeePass.Pages.SettingsPage" />
                         </core:EventTriggerBehavior>
                     </interactivity:Interaction.Behaviors>
-                </AppBarButton>
+                </AppBarButton>-->
             </CommandBar.SecondaryCommands>
             <AppBarToggleButton Icon="Edit" Label="Edit" IsChecked="{Binding IsEditMode, Mode=TwoWay}">
                 <interactivity:Interaction.Behaviors>
diff --git a/ModernKeePass/Pages/GroupDetailPage.xaml b/ModernKeePass/Pages/GroupDetailPage.xaml
index a2edc95..f180b7f 100644
--- a/ModernKeePass/Pages/GroupDetailPage.xaml
+++ b/ModernKeePass/Pages/GroupDetailPage.xaml
@@ -32,13 +32,13 @@
                         </core:EventTriggerBehavior>
                     </interactivity:Interaction.Behaviors>
                 </AppBarButton>
-                <AppBarButton Icon="Setting" Label="Settings">
+                <!--<AppBarButton Icon="Setting" Label="Settings">
                     <interactivity:Interaction.Behaviors>
                         <core:EventTriggerBehavior EventName="Click">
                             <core:NavigateToPageAction TargetPage="ModernKeePass.Pages.SettingsPage" />
                         </core:EventTriggerBehavior>
                     </interactivity:Interaction.Behaviors>
-                </AppBarButton>
+                </AppBarButton>-->
             </CommandBar.SecondaryCommands>
             <AppBarToggleButton Icon="Edit" Label="Edit" IsChecked="{Binding IsEditMode, Mode=TwoWay}">
                 <interactivity:Interaction.Behaviors>
@@ -74,10 +74,71 @@
             <RowDefinition Height="40"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
+        <Grid Grid.Row="1">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+        <ListView 
+            Grid.Column="0"
+            x:Name="LeftListView"
+            Margin="0,0,0,-10"
+            SelectionChanged="groups_SelectionChanged"
+            IsSwipeEnabled="false"
+            IsSynchronizedWithCurrentItem="False"
+            DataContext="{Binding DataContext, ElementName=PageRoot}" 
+            RequestedTheme="Dark"
+            Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+            Foreground="{ThemeResource DefaultTextForegroundThemeBrush}">
+            <ListView.Resources>
+                <DataTemplate x:Name="Collapsed">
+                    <SymbolIcon Symbol="{Binding IconSymbol}" Margin="8,0,0,0">
+                        <ToolTipService.ToolTip>
+                            <ToolTip Content="{Binding Name}" />
+                        </ToolTipService.ToolTip>
+                    </SymbolIcon>
+                </DataTemplate>
+                <DataTemplate x:Name="Expanded">
+                    <StackPanel Orientation="Horizontal">
+                        <SymbolIcon Symbol="{Binding IconSymbol}" Margin="8,0,0,0" />
+                        <TextBlock Text="{Binding Name}" FontWeight="{Binding FontWeight}" TextWrapping="NoWrap" VerticalAlignment="Center" Margin="30,0,20,0" FontStyle="{Binding Name, ConverterParameter=Recycle Bin, Converter={StaticResource TextToFontStyleConverter}}" />
+                        <!--<TextBlock Text="{Binding EntryCount}" HorizontalAlignment="Right" VerticalAlignment="Center" />-->
+                    </StackPanel>
+                </DataTemplate>
+            </ListView.Resources>
+            <ListView.ItemsSource>
+                <Binding Source="{StaticResource GroupsViewSource}"/>
+            </ListView.ItemsSource>
+            <ListView.ItemContainerStyle>
+                <Style TargetType="ListViewItem">
+                    <Setter Property="VerticalContentAlignment" Value="Stretch" />
+                    <!--<Setter Property="HorizontalContentAlignment" Value="Center" />-->
+                    <Setter Property="Padding" Value="0"/>
+                    <Setter Property="Margin" Value="0"/>
+                </Style>
+            </ListView.ItemContainerStyle>
+            <ListView.HeaderTemplate>
+                <DataTemplate>
+                    <ToggleButton Style="{StaticResource HamburgerToggleButton}">
+                        <interactivity:Interaction.Behaviors>
+                            <core:EventTriggerBehavior EventName="Loaded">
+                                <core:ChangePropertyAction PropertyName="ItemTemplate" Value="{StaticResource Collapsed}" TargetObject="{Binding ElementName=LeftListView}"/>
+                            </core:EventTriggerBehavior>
+                            <core:EventTriggerBehavior EventName="Checked">
+                                <core:ChangePropertyAction PropertyName="ItemTemplate" Value="{StaticResource Expanded}" TargetObject="{Binding ElementName=LeftListView}"/>
+                            </core:EventTriggerBehavior>
+                            <core:EventTriggerBehavior EventName="Unchecked">
+                                <core:ChangePropertyAction PropertyName="ItemTemplate" Value="{StaticResource Collapsed}" TargetObject="{Binding ElementName=LeftListView}"/>
+                            </core:EventTriggerBehavior>
+                        </interactivity:Interaction.Behaviors>
+                    </ToggleButton>
+                </DataTemplate>
+            </ListView.HeaderTemplate>
+        </ListView>
         <!-- Horizontal scrolling grid -->
-        <SemanticZoom Grid.Row="1" ViewChangeStarted="SemanticZoom_ViewChangeStarted" >
+        <SemanticZoom Grid.Column="1" ViewChangeStarted="SemanticZoom_ViewChangeStarted" Margin="0,30,0,0">
             <SemanticZoom.ZoomedInView>
-                <GridView Margin="-3"
+                <GridView 
                     x:Name="GridView"
                     AutomationProperties.AutomationId="ItemGridView"
                     AutomationProperties.Name="Entries"
@@ -154,63 +215,6 @@
                             <Setter Property="Margin" Value="52,0,0,2"/>
                         </Style>
                     </GridView.ItemContainerStyle>
-                    <GridView.Header>
-                        <ListView 
-                            x:Name="LeftListView"
-                            Margin="0,0,0,-10"
-                            SelectionChanged="groups_SelectionChanged"
-                            IsSwipeEnabled="false"
-                            IsSynchronizedWithCurrentItem="False"
-                            DataContext="{Binding DataContext, ElementName=PageRoot}" 
-                            RequestedTheme="Dark"
-                            Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
-                            Foreground="{ThemeResource DefaultTextForegroundThemeBrush}">
-                            <ListView.Resources>
-                                <DataTemplate x:Name="Collapsed">
-                                    <SymbolIcon Symbol="{Binding IconSymbol}" Margin="8,0,0,0">
-                                        <ToolTipService.ToolTip>
-                                            <ToolTip Content="{Binding Name}" />
-                                        </ToolTipService.ToolTip>
-                                    </SymbolIcon>
-                                </DataTemplate>
-                                <DataTemplate x:Name="Expanded">
-                                    <StackPanel Orientation="Horizontal">
-                                        <SymbolIcon Symbol="{Binding IconSymbol}" Margin="8,0,0,0" />
-                                        <TextBlock Text="{Binding Name}" FontWeight="{Binding FontWeight}" TextWrapping="NoWrap" VerticalAlignment="Center" Margin="30,0,20,0" FontStyle="{Binding Name, ConverterParameter=Recycle Bin, Converter={StaticResource TextToFontStyleConverter}}" />
-                                        <!--<TextBlock Text="{Binding EntryCount}" HorizontalAlignment="Right" VerticalAlignment="Center" />-->
-                                    </StackPanel>
-                                </DataTemplate>
-                            </ListView.Resources>
-                            <ListView.ItemsSource>
-                                <Binding Source="{StaticResource GroupsViewSource}"/>
-                            </ListView.ItemsSource>
-                            <ListView.ItemContainerStyle>
-                                <Style TargetType="ListViewItem">
-                                    <Setter Property="VerticalContentAlignment" Value="Stretch" />
-                                    <!--<Setter Property="HorizontalContentAlignment" Value="Center" />-->
-                                    <Setter Property="Padding" Value="0"/>
-                                    <Setter Property="Margin" Value="0"/>
-                                </Style>
-                            </ListView.ItemContainerStyle>
-                            <ListView.HeaderTemplate>
-                                <DataTemplate>
-                                    <ToggleButton Style="{StaticResource HamburgerToggleButton}">
-                                        <interactivity:Interaction.Behaviors>
-                                            <core:EventTriggerBehavior EventName="Loaded">
-                                                <core:ChangePropertyAction PropertyName="ItemTemplate" Value="{StaticResource Collapsed}" TargetObject="{Binding ElementName=LeftListView}"/>
-                                            </core:EventTriggerBehavior>
-                                            <core:EventTriggerBehavior EventName="Checked">
-                                                <core:ChangePropertyAction PropertyName="ItemTemplate" Value="{StaticResource Expanded}" TargetObject="{Binding ElementName=LeftListView}"/>
-                                            </core:EventTriggerBehavior>
-                                            <core:EventTriggerBehavior EventName="Unchecked">
-                                                <core:ChangePropertyAction PropertyName="ItemTemplate" Value="{StaticResource Collapsed}" TargetObject="{Binding ElementName=LeftListView}"/>
-                                            </core:EventTriggerBehavior>
-                                        </interactivity:Interaction.Behaviors>
-                                    </ToggleButton>
-                                </DataTemplate>
-                            </ListView.HeaderTemplate>
-                        </ListView>
-                    </GridView.Header>
                 </GridView>
             </SemanticZoom.ZoomedInView>
 
@@ -248,6 +252,7 @@
             </SemanticZoom.ZoomedOutView>
         </SemanticZoom>
 
+        </Grid>
         <!-- Back button and page title -->
         <Grid Grid.Row="0" Background="{ThemeResource AppBarBackgroundThemeBrush}">
             <Grid.ColumnDefinitions>
diff --git a/ModernKeePass/Pages/MainPageFrames/AboutPage.xaml b/ModernKeePass/Pages/MainPageFrames/AboutPage.xaml
index d2f70bf..1bc44ec 100644
--- a/ModernKeePass/Pages/MainPageFrames/AboutPage.xaml
+++ b/ModernKeePass/Pages/MainPageFrames/AboutPage.xaml
@@ -12,26 +12,26 @@
     </Page.DataContext>
 
     <StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <TextBlock Style="{StaticResource BodyTextBlockStyle}">
+        <TextBlock Style="{StaticResource BodyTextBlockStyle}"  Margin="10,0,0,0">
             <Run Text="{Binding Name}"/>
             <Run Text="version"/>
             <Run Text="{Binding Version}" />
         </TextBlock>
-        <TextBlock Style="{StaticResource BodyTextBlockStyle}" Margin="20,0,0,0">
+        <TextBlock Style="{StaticResource BodyTextBlockStyle}" Margin="30,0,0,0">
             <Run Text="A modern password manager for the Windows Store"/>
         </TextBlock>
-        <TextBlock Style="{StaticResource BodyTextBlockStyle}" Margin="20,0,0,0">
+        <TextBlock Style="{StaticResource BodyTextBlockStyle}" Margin="30,0,0,0">
             <Run Text="Homepage: "/>
             <Hyperlink NavigateUri="https://github.com/wismna/ModernKeePass">
                 <Run Text="https://github.com/wismna/ModernKeePass"/>
             </Hyperlink></TextBlock>
-        <TextBlock Style="{StaticResource BodyTextBlockStyle}">
+        <TextBlock Style="{StaticResource BodyTextBlockStyle}"  Margin="10,0,0,0">
             <Run Text="Credits:"/>
         </TextBlock>
-        <TextBlock Style="{StaticResource BodyTextBlockStyle}" Margin="20,0,0,0">
+        <TextBlock Style="{StaticResource BodyTextBlockStyle}" Margin="30,0,0,0">
             <Run Text="Dominik Reichl for the KeePass application and file format"/>
         </TextBlock>
-        <TextBlock Style="{StaticResource BodyTextBlockStyle}" Margin="20,0,0,0">
+        <TextBlock Style="{StaticResource BodyTextBlockStyle}" Margin="30,0,0,0">
             <Run Text="ArtjomP for his PCL adapatation of the KeePass Library"/>
         </TextBlock>
     </StackPanel>
diff --git a/ModernKeePass/Pages/MainPageFrames/WelcomePage.xaml b/ModernKeePass/Pages/MainPageFrames/WelcomePage.xaml
index 54ec365..9552a79 100644
--- a/ModernKeePass/Pages/MainPageFrames/WelcomePage.xaml
+++ b/ModernKeePass/Pages/MainPageFrames/WelcomePage.xaml
@@ -7,13 +7,12 @@
     mc:Ignorable="d">
 
     <StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <TextBlock Style="{StaticResource HeaderTextBlockStyle}" Margin="0,-20,0,0">Welcome</TextBlock>
-        <StackPanel Orientation="Horizontal" Margin="0,20,0,10">
-            <SymbolIcon Symbol="Back" Margin="-30,7,40,0" />
+        <StackPanel Orientation="Horizontal" Margin="0,2,0,10">
+            <SymbolIcon Symbol="Back" Margin="0,7,40,0" />
             <TextBlock Style="{StaticResource SubheaderTextBlockStyle}">Have an existing password database? Open it here.</TextBlock>
         </StackPanel>
-        <StackPanel Orientation="Horizontal">
-            <SymbolIcon Symbol="Back" Margin="-30,7,40,0" />
+        <StackPanel Orientation="Horizontal" Margin="0,6,0,10">
+            <SymbolIcon Symbol="Back" Margin="0,7,40,0" />
             <TextBlock Style="{StaticResource SubheaderTextBlockStyle}">Want to create a new password database? Do it here.</TextBlock>
         </StackPanel>
     </StackPanel>