diff --git a/ModernKeePass/Actions/CloseFlyoutAction.cs b/ModernKeePass/Actions/CloseFlyoutAction.cs
deleted file mode 100644
index 66a2448..0000000
--- a/ModernKeePass/Actions/CloseFlyoutAction.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Microsoft.Xaml.Interactivity;
-
-namespace ModernKeePass.Actions
-{
-    public class CloseFlyoutAction : DependencyObject, IAction
-    {
-        public object Execute(object sender, object parameter)
-        {
-            var flyout = sender as Flyout;
-            flyout?.Hide();
-
-            return null;
-        }
-    }
-}
diff --git a/ModernKeePass/Actions/SetupFocusAction.cs b/ModernKeePass/Actions/SetupFocusAction.cs
index 4dcf00f..8ef7c99 100644
--- a/ModernKeePass/Actions/SetupFocusAction.cs
+++ b/ModernKeePass/Actions/SetupFocusAction.cs
@@ -1,4 +1,6 @@
-using Windows.UI.Xaml;
+using System.Threading.Tasks;
+using Windows.UI.Core;
+using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Microsoft.Xaml.Interactivity;
 
@@ -13,11 +15,13 @@ namespace ModernKeePass.Actions
         }
 
         public static readonly DependencyProperty TargetObjectProperty =
-            DependencyProperty.Register("TargetObject", typeof(Control), typeof(SetupFocusAction), new PropertyMetadata(0));
+            DependencyProperty.Register("TargetObject", typeof(Control), typeof(SetupFocusAction), new PropertyMetadata(null));
 
         public object Execute(object sender, object parameter)
         {
-            return TargetObject?.Focus(FocusState.Programmatic);
+            return Task.Factory.StartNew(
+                () => Dispatcher.RunAsync(CoreDispatcherPriority.Low,
+                    () => TargetObject?.Focus(FocusState.Programmatic)));
         }
     }
 }
\ No newline at end of file
diff --git a/ModernKeePass/Common/DatabaseHelper.cs b/ModernKeePass/Common/DatabaseHelper.cs
index 020770c..7166d48 100644
--- a/ModernKeePass/Common/DatabaseHelper.cs
+++ b/ModernKeePass/Common/DatabaseHelper.cs
@@ -33,7 +33,12 @@ namespace ModernKeePass.Common
             }
         }
         
-
+        /// <summary>
+        /// Open a KeePass database
+        /// </summary>
+        /// <param name="password">The database password</param>
+        /// <param name="createNew">True to create a new database before opening it</param>
+        /// <returns>An error message, if any</returns>
         public string Open(string password, bool createNew = false)
         {
             var key = new CompositeKey();
@@ -65,6 +70,10 @@ namespace ModernKeePass.Common
             return string.Empty;
         }
 
+        /// <summary>
+        /// Save the current database to another file and open it
+        /// </summary>
+        /// <param name="file">The new database file</param>
         internal void Save(StorageFile file)
         {
             DatabaseFile = file;
@@ -72,12 +81,18 @@ namespace ModernKeePass.Common
             Status = DatabaseStatus.Opened;
         }
 
+        /// <summary>
+        /// Commit the changes to the currently opened database to file
+        /// </summary>
         public void Save()
         {
             if (_pwDatabase != null && _pwDatabase.IsOpen)
                 _pwDatabase.Save(new NullStatusLogger());
         }
 
+        /// <summary>
+        /// Close the currently opened database
+        /// </summary>
         public void Close()
         {
             _pwDatabase?.Close();
diff --git a/ModernKeePass/Common/MessageDialogHelper.cs b/ModernKeePass/Common/MessageDialogHelper.cs
new file mode 100644
index 0000000..1750314
--- /dev/null
+++ b/ModernKeePass/Common/MessageDialogHelper.cs
@@ -0,0 +1,35 @@
+using System;
+using Windows.UI.Popups;
+using Windows.UI.Xaml.Controls;
+using ModernKeePass.Interfaces;
+using ModernKeePass.ViewModels;
+
+namespace ModernKeePass.Common
+{
+    public static class MessageDialogHelper
+    {
+        public static async void ShowDeleteConfirmationDialog(string text, IPwEntity model, Frame backFrame)
+        {
+            // Create the message dialog and set its content
+            var messageDialog = new MessageDialog(text);
+
+            // Add commands and set their callbacks; both buttons use the same callback function instead of inline event handlers
+            messageDialog.Commands.Add(new UICommand("Delete", delete =>
+            {
+                ToastNotificationHelper.ShowUndoToast(model);
+                model.MarkForDelete();
+                if (backFrame.CanGoBack) backFrame.GoBack();
+            }));
+            messageDialog.Commands.Add(new UICommand("Cancel"));
+
+            // Set the command that will be invoked by default
+            messageDialog.DefaultCommandIndex = 1;
+
+            // Set the command to be invoked when escape is pressed
+            messageDialog.CancelCommandIndex = 1;
+
+            // Show the message dialog
+            await messageDialog.ShowAsync();
+        }
+    }
+}
diff --git a/ModernKeePass/Common/ToastNotificationHelper.cs b/ModernKeePass/Common/ToastNotificationHelper.cs
index 35f66ae..a46d783 100644
--- a/ModernKeePass/Common/ToastNotificationHelper.cs
+++ b/ModernKeePass/Common/ToastNotificationHelper.cs
@@ -4,12 +4,13 @@ using Windows.Data.Xml.Dom;
 using Windows.UI.Notifications;
 using Windows.UI.Xaml;
 using ModernKeePass.Interfaces;
+using ModernKeePass.ViewModels;
 
 namespace ModernKeePass.Common
 {
     public static class ToastNotificationHelper
     {
-        public static /*async*/ void ShowUndoToast(string entityType, IPwEntity entity)
+        public static /*async*/ void ShowUndoToast(IPwEntity entity)
         {
             // This is for Windows 10
             // Construct the visuals of the toast
@@ -64,6 +65,8 @@ namespace ModernKeePass.Common
             var toast = new ToastNotification(toastXml) {ExpirationTime = DateTime.Now.AddSeconds(5)};
             toast.Dismissed += Toast_Dismissed;
             */
+
+            var entityType = entity is GroupVm ? "Group" : "Entry";
             var notificationXml = ToastNotificationManager.GetTemplateContent(ToastTemplateType.ToastText02);
             var toastElements = notificationXml.GetElementsByTagName("text");
             toastElements[0].AppendChild(notificationXml.CreateTextNode($"{entityType} {entity.Name} deleted"));
diff --git a/ModernKeePass/Interfaces/IPwEntity.cs b/ModernKeePass/Interfaces/IPwEntity.cs
index 48c8730..3142f80 100644
--- a/ModernKeePass/Interfaces/IPwEntity.cs
+++ b/ModernKeePass/Interfaces/IPwEntity.cs
@@ -13,5 +13,7 @@ namespace ModernKeePass.Interfaces
 
         void CommitDelete();
         void UndoDelete();
+        void Save();
+        void MarkForDelete();
     }
 }
\ No newline at end of file
diff --git a/ModernKeePass/Mappings/PwIconToSegoeMapping.cs b/ModernKeePass/Mappings/PwIconToSegoeMapping.cs
index 75dc1f4..f1285fc 100644
--- a/ModernKeePass/Mappings/PwIconToSegoeMapping.cs
+++ b/ModernKeePass/Mappings/PwIconToSegoeMapping.cs
@@ -10,18 +10,19 @@ namespace ModernKeePass.Mappings
             switch (icon)
             {
                 case PwIcon.Key: return Symbol.Permissions;
+                case PwIcon.WorldSocket:
                 case PwIcon.World: return Symbol.World;
                 case PwIcon.Warning: return Symbol.Important;
                 case PwIcon.WorldComputer:
+                case PwIcon.Drive:
                 case PwIcon.DriveWindows:
                 case PwIcon.NetworkServer: return Symbol.MapDrive;
-                //case PwIcon.MarkedDirectory: return Symbol.;
+                case PwIcon.MarkedDirectory: return Symbol.Map;
                 case PwIcon.UserCommunication: return Symbol.ContactInfo;
-                //case PwIcon.Parts: return Symbol.;
+                case PwIcon.Parts: return Symbol.ViewAll;
                 case PwIcon.Notepad: return Symbol.Document;
-                //case PwIcon.WorldScoket: return Symbol.;
                 case PwIcon.Identity: return Symbol.Contact2;
-                //case PwIcon.PaperReady: return Symbol.;
+                case PwIcon.PaperReady: return Symbol.SyncFolder;
                 case PwIcon.Digicam: return Symbol.Camera;
                 case PwIcon.IRCommunication: return Symbol.View;
                 case PwIcon.Energy: return Symbol.ZeroBars;
@@ -36,17 +37,16 @@ namespace ModernKeePass.Mappings
                 case PwIcon.Screen: return Symbol.GoToStart;
                 case PwIcon.EnergyCareful: return Symbol.FourBars;
                 case PwIcon.Disk: return Symbol.Save;
-                //case PwIcon.Drive: return Symbol.;
                 //case PwIcon.PaperQ: return Symbol.;
                 //case PwIcon.TerminalEncrypted: return Symbol.;
-                //case PwIcon.Console: return Symbol.;
-                //case PwIcon.Printer: return Symbol.;
+                case PwIcon.Console: return Symbol.SlideShow;
+                case PwIcon.Printer: return Symbol.Scan;
                 case PwIcon.ProgramIcons: return Symbol.GoToStart;
                 //case PwIcon.Run: return Symbol.;
                 case PwIcon.Settings:
                 case PwIcon.Tool: return Symbol.Repair;
-                //case PwIcon.Archive: return Symbol.;
-                case PwIcon.Count: return Symbol.MapDrive;
+                case PwIcon.Archive: return Symbol.Crop;
+                case PwIcon.Count: return Symbol.Calculator;
                 case PwIcon.Clock: return Symbol.Clock;
                 case PwIcon.EMailSearch: return Symbol.Find;
                 case PwIcon.PaperFlag: return Symbol.Flag;
@@ -72,10 +72,10 @@ namespace ModernKeePass.Mappings
                 //case PwIcon.Feather: return Symbol.;
                 //case PwIcon.Apple: return Symbol.;
                 //case PwIcon.Wiki: return Symbol.;
-                //case PwIcon.Money: return Symbol.;
+                case PwIcon.Money: return Symbol.Shop;
                 case PwIcon.Certificate: return Symbol.PreviewLink;
                 case PwIcon.BlackBerry: return Symbol.CellPhone;
-                default: return Symbol.More;
+                default: return Symbol.Stop;
             }
         }
     }
diff --git a/ModernKeePass/ModernKeePass.csproj b/ModernKeePass/ModernKeePass.csproj
index 9f7f218..77c0789 100644
--- a/ModernKeePass/ModernKeePass.csproj
+++ b/ModernKeePass/ModernKeePass.csproj
@@ -107,12 +107,12 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="Actions\CloseFlyoutAction.cs" />
     <Compile Include="Actions\SetupFocusAction.cs" />
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
     <Compile Include="Common\DatabaseHelper.cs" />
+    <Compile Include="Common\MessageDialogHelper.cs" />
     <Compile Include="Common\NavigationHelper.cs" />
     <Compile Include="Common\NotifyPropertyChangedBase.cs" />
     <Compile Include="Common\ObservableDictionary.cs" />
@@ -136,7 +136,7 @@
     <Compile Include="Events\PasswordEventArgs.cs" />
     <Compile Include="Interfaces\IIsEnabled.cs" />
     <Compile Include="Interfaces\IPwEntity.cs" />
-    <Compile Include="MainPage.xaml.cs">
+    <Compile Include="Pages\MainPage.xaml.cs">
       <DependentUpon>MainPage.xaml</DependentUpon>
     </Compile>
     <Compile Include="Mappings\PwIconToSegoeMapping.cs" />
@@ -198,7 +198,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="MainPage.xaml">
+    <Page Include="Pages\MainPage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
diff --git a/ModernKeePass/Pages/AboutPage.xaml b/ModernKeePass/Pages/AboutPage.xaml
index fff7697..0cbb0dc 100644
--- a/ModernKeePass/Pages/AboutPage.xaml
+++ b/ModernKeePass/Pages/AboutPage.xaml
@@ -15,7 +15,11 @@
         <TextBlock Style="{StaticResource HeaderTextBlockStyle}" Margin="0,-20,0,20">
             <Run Text="About"/>
         </TextBlock>
-        <TextBlock Style="{StaticResource BodyTextBlockStyle}" Text="{Binding Version}" />
+        <TextBlock Style="{StaticResource BodyTextBlockStyle}">
+            <Run Text="{Binding Name}"/>
+            <Run Text="version"/>
+            <Run Text="{Binding Version}" />
+        </TextBlock>
         <TextBlock Style="{StaticResource BodyTextBlockStyle}" Margin="20,0,0,0">
             <Run Text="A modern password manager for the Windows Store"/>
         </TextBlock>
diff --git a/ModernKeePass/Pages/EntryDetailPage.xaml b/ModernKeePass/Pages/EntryDetailPage.xaml
index 21d2945..45f4fd2 100644
--- a/ModernKeePass/Pages/EntryDetailPage.xaml
+++ b/ModernKeePass/Pages/EntryDetailPage.xaml
@@ -6,12 +6,12 @@
     xmlns:viewModels="using:ModernKeePass.ViewModels"
     xmlns:converters="using:ModernKeePass.Converters" 
     xmlns:local="using:ModernKeePass.Controls"
-    xmlns:Interactivity="using:Microsoft.Xaml.Interactivity" xmlns:Core="using:Microsoft.Xaml.Interactions.Core"
-    xmlns:Actions="using:ModernKeePass.Actions"
+    xmlns:interactivity="using:Microsoft.Xaml.Interactivity" 
+    xmlns:core="using:Microsoft.Xaml.Interactions.Core"
+    xmlns:actions="using:ModernKeePass.Actions"
     x:Name="PageRoot"
     x:Class="ModernKeePass.Pages.EntryDetailPage"
     mc:Ignorable="d">
-
     <Page.Resources>
         <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
         <converters:InverseBooleanToVisibilityConverter x:Key="InverseBooleanToVisibilityConverter"/>
@@ -327,15 +327,17 @@
                                 FontSize="{TemplateBinding FontSize}"
                                 VerticalAlignment="Stretch" >
                                 <Button.Flyout>
-                                    <Flyout x:Name="GenerateButtonFlyout">
-                                        <Interactivity:Interaction.Behaviors>
-                                            <Core:DataTriggerBehavior Binding="{Binding Password}" ComparisonCondition="NotEqual" Value="" >
-                                                <Actions:CloseFlyoutAction />
-                                            </Core:DataTriggerBehavior>
-                                        </Interactivity:Interaction.Behaviors>
+                                    <Flyout>
+                                        <interactivity:Interaction.Behaviors>
+                                            <core:DataTriggerBehavior Binding="{Binding Password}" ComparisonCondition="NotEqual" Value="" >
+                                                <!--<actions:CloseFlyoutAction />-->
+                                                <core:CallMethodAction MethodName="Hide" />
+                                            </core:DataTriggerBehavior>
+                                        </interactivity:Interaction.Behaviors>
                                         <StackPanel>
                                             <TextBlock>
-                                                <Run Text="Password Length:"/>
+                                                <Run Text="Password Length: "/>
+                                                <Run Text="{Binding PasswordLength}" />
                                             </TextBlock>
                                             <Slider Value="{Binding PasswordLength, Mode=TwoWay}" Margin="0,-10,0,-20" />
                                             <CheckBox IsChecked="{Binding UpperCasePatternSelected, Mode=TwoWay}" Content="Upper case (A, B, C, ...)"/>
@@ -346,9 +348,14 @@
                                             <CheckBox IsChecked="{Binding SpacePatternSelected, Mode=TwoWay}" Content="Space ( )"/>
                                             <CheckBox IsChecked="{Binding SpecialPatternSelected, Mode=TwoWay}" Content="Special (!, $, %, ...)"/>
                                             <CheckBox IsChecked="{Binding BracketsPatternSelected, Mode=TwoWay}" Content="Brackets ([], {}, (), ...)"/>
-                                            <Button Click="PasswordGenerationButton_Click" Content="Generate"/>
+                                            <Button Content="Generate">
+                                                <interactivity:Interaction.Behaviors>
+                                                    <core:EventTriggerBehavior EventName="Click">
+                                                        <core:CallMethodAction TargetObject="{Binding}" MethodName="GeneratePassword"/>
+                                                    </core:EventTriggerBehavior>
+                                                </interactivity:Interaction.Behaviors>
+                                            </Button>
                                         </StackPanel>
-
                                     </Flyout>
                                 </Button.Flyout>
                             </Button>
@@ -358,11 +365,32 @@
             </Setter>
         </Style>
     </Page.Resources>
-
     <Page.DataContext>
         <viewModels:EntryVm/>
     </Page.DataContext>
-
+    <Page.BottomAppBar>
+        <CommandBar x:Name="CommandBar" VerticalAlignment="Center">
+            <CommandBar.SecondaryCommands>
+                <AppBarButton Icon="Save" Label="Save">
+                    <interactivity:Interaction.Behaviors>
+                        <core:EventTriggerBehavior EventName="Click">
+                            <core:CallMethodAction TargetObject="{Binding}" MethodName="Save"/>
+                            <core:ChangePropertyAction TargetObject="{Binding ElementName=CommandBar}" PropertyName="IsOpen" Value="False" />
+                        </core:EventTriggerBehavior>
+                    </interactivity:Interaction.Behaviors>
+                </AppBarButton>
+                <AppBarButton Icon="Setting" Label="Settings" />
+            </CommandBar.SecondaryCommands>
+            <AppBarToggleButton Icon="Edit" Label="Edit" IsChecked="{Binding IsEditMode, Mode=TwoWay}">
+                <interactivity:Interaction.Behaviors>
+                    <core:EventTriggerBehavior EventName="Click">
+                        <core:ChangePropertyAction TargetObject="{Binding ElementName=CommandBar}" PropertyName="IsOpen" Value="False" />
+                    </core:EventTriggerBehavior>
+                </interactivity:Interaction.Behaviors>
+            </AppBarToggleButton>
+            <AppBarButton Icon="Delete" Label="Delete" Click="DeleteButton_Click" />
+        </CommandBar>
+    </Page.BottomAppBar>
     <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
         <Grid.ChildrenTransitions>
             <TransitionCollection>
@@ -374,7 +402,7 @@
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
 
-        <StackPanel Grid.Row="1" Margin="20,0,0,0" >
+        <StackPanel x:Name="stackPanel" Grid.Row="1" Margin="20,0,0,0" >
             <StackPanel.Resources>
                 <Style TargetType="TextBlock">
                     <Setter Property="Margin" Value="0,20,0,0"/>
@@ -429,11 +457,13 @@
                 TextWrapping="NoWrap" 
                 VerticalAlignment="Center" 
                 Margin="0,0,30,0"
-                PlaceholderText="New entry name..."/>
-            <CommandBar Grid.Column="2" Background="Transparent" IsOpen="True" VerticalAlignment="Center" Margin="0,20,0,0">
-                <AppBarToggleButton Icon="Edit" Label="Edit" IsChecked="{Binding IsEditMode, Mode=TwoWay}" />
-                <AppBarButton Icon="Delete" Label="Delete" Click="AppBarButton_Click" />
-            </CommandBar>
+                PlaceholderText="New entry name...">
+                <interactivity:Interaction.Behaviors>
+                    <core:DataTriggerBehavior Binding="{Binding IsEditMode}" Value="True">
+                        <actions:SetupFocusAction TargetObject="{Binding ElementName=TitleTextBox}" />
+                    </core:DataTriggerBehavior>
+                </interactivity:Interaction.Behaviors>
+            </TextBox>
         </Grid>
     </Grid>
 </Page>
\ No newline at end of file
diff --git a/ModernKeePass/Pages/EntryDetailPage.xaml.cs b/ModernKeePass/Pages/EntryDetailPage.xaml.cs
index b0d5da4..ea701e7 100644
--- a/ModernKeePass/Pages/EntryDetailPage.xaml.cs
+++ b/ModernKeePass/Pages/EntryDetailPage.xaml.cs
@@ -64,10 +64,6 @@ namespace ModernKeePass.Pages
             navigationHelper.OnNavigatedTo(e);
             if (!(e.Parameter is EntryVm)) return;
             DataContext = (EntryVm)e.Parameter;
-            if (Model.IsEditMode)
-                Task.Factory.StartNew(
-                    () => Dispatcher.RunAsync(CoreDispatcherPriority.Low,
-                        () => TitleTextBox.Focus(FocusState.Programmatic)));
         }
 
         protected override void OnNavigatedFrom(NavigationEventArgs e)
@@ -77,28 +73,9 @@ namespace ModernKeePass.Pages
 
         #endregion
         
-        private async void AppBarButton_Click(object sender, RoutedEventArgs e)
+        private void DeleteButton_Click(object sender, RoutedEventArgs e)
         {
-            // Create the message dialog and set its content
-            var messageDialog = new MessageDialog("Are you sure you want to delete this entry?");
-
-            // Add commands and set their callbacks; both buttons use the same callback function instead of inline event handlers
-            messageDialog.Commands.Add(new UICommand("Delete", delete =>
-            {
-                ToastNotificationHelper.ShowUndoToast("Entry", Model);
-                Model.MarkForDelete();
-                if (Frame.CanGoBack) Frame.GoBack();
-            }));
-            messageDialog.Commands.Add(new UICommand("Cancel"));
-
-            // Set the command that will be invoked by default
-            messageDialog.DefaultCommandIndex = 1;
-
-            // Set the command to be invoked when escape is pressed
-            messageDialog.CancelCommandIndex = 1;
-
-            // Show the message dialog
-            await messageDialog.ShowAsync();
+            MessageDialogHelper.ShowDeleteConfirmationDialog("Are you sure you want to delete this entry?", Model, Frame);
         }
 
         private async void UrlButton_Click(object sender, RoutedEventArgs e)
@@ -113,10 +90,5 @@ namespace ModernKeePass.Pages
                 // TODO: Show some error
             }
         }
-
-        private void PasswordGenerationButton_Click(object sender, RoutedEventArgs e)
-        {
-            Model.GeneratePassword();
-        }
     }
 }
diff --git a/ModernKeePass/Pages/GroupDetailPage.xaml b/ModernKeePass/Pages/GroupDetailPage.xaml
index fcacb07..2090d1f 100644
--- a/ModernKeePass/Pages/GroupDetailPage.xaml
+++ b/ModernKeePass/Pages/GroupDetailPage.xaml
@@ -8,6 +8,7 @@
     xmlns:local="using:ModernKeePass.Controls"
     xmlns:interactivity="using:Microsoft.Xaml.Interactivity" 
     xmlns:core="using:Microsoft.Xaml.Interactions.Core"
+    xmlns:actions="using:ModernKeePass.Actions"
     x:Name="PageRoot"
     x:Class="ModernKeePass.Pages.GroupDetailPage"
     mc:Ignorable="d" >
@@ -21,15 +22,29 @@
         <viewModels:GroupVm />
     </Page.DataContext>
     <Page.BottomAppBar>
-        <CommandBar VerticalAlignment="Center" >
-            <AppBarToggleButton Icon="Edit" Label="Edit" IsChecked="{Binding IsEditMode, Mode=TwoWay}" Click="EditButton_Click" />
-            <AppBarButton Icon="Delete" Label="Delete" IsEnabled="{Binding IsNotRoot}" Click="DeleteButton_Click" />
+        <CommandBar x:Name="CommandBar" VerticalAlignment="Center">
             <CommandBar.SecondaryCommands>
+                <AppBarButton Icon="Save" Label="Save">
+                    <interactivity:Interaction.Behaviors>
+                        <core:EventTriggerBehavior EventName="Click">
+                            <core:CallMethodAction TargetObject="{Binding}" MethodName="Save"/>
+                            <core:ChangePropertyAction TargetObject="{Binding ElementName=CommandBar}" PropertyName="IsOpen" Value="False" />
+                        </core:EventTriggerBehavior>
+                    </interactivity:Interaction.Behaviors>
+                </AppBarButton>
                 <AppBarButton Icon="Setting" Label="Settings" />
             </CommandBar.SecondaryCommands>
+            <AppBarToggleButton Icon="Edit" Label="Edit" IsChecked="{Binding IsEditMode, Mode=TwoWay}">
+                <interactivity:Interaction.Behaviors>
+                    <core:EventTriggerBehavior EventName="Click">
+                        <core:ChangePropertyAction TargetObject="{Binding ElementName=CommandBar}" PropertyName="IsOpen" Value="False" />
+                    </core:EventTriggerBehavior>
+                </interactivity:Interaction.Behaviors>
+            </AppBarToggleButton>
+            <AppBarButton Icon="Delete" Label="Delete" IsEnabled="{Binding IsNotRoot}" Click="DeleteButton_Click" />
         </CommandBar>
     </Page.BottomAppBar>
-    <Grid Background="{StaticResource ApplicationPageBackgroundThemeBrush}">
+    <Grid>
         <Grid.Resources>
             <CollectionViewSource
                 x:Name="GroupsViewSource"
@@ -41,6 +56,9 @@
                 x:Name="EntriesZoomedOutViewSource"
                 Source="{Binding EntriesZoomedOut}" IsSourceGrouped="True"/>
         </Grid.Resources>
+        <Grid.Background>
+            <StaticResource ResourceKey="ApplicationPageBackgroundThemeBrush"/>
+        </Grid.Background>
         <Grid.ChildrenTransitions>
             <TransitionCollection>
                 <EntranceThemeTransition/>
@@ -61,6 +79,11 @@
                     IsSwipeEnabled="false" 
                     SelectionChanged="entries_SelectionChanged"
                     IsSynchronizedWithCurrentItem="False">
+                    <interactivity:Interaction.Behaviors>
+                        <core:DataTriggerBehavior Binding="{Binding IsEditMode}" Value="False">
+                            <actions:SetupFocusAction TargetObject="{Binding ElementName=GridView}" />
+                        </core:DataTriggerBehavior>
+                    </interactivity:Interaction.Behaviors>
                     <GridView.Resources>
                         <DataTemplate x:Name="GroupFirstItem">
                             <Border 
@@ -147,7 +170,7 @@
                                 <DataTemplate x:Name="Expanded">
                                     <StackPanel Orientation="Horizontal">
                                         <SymbolIcon Symbol="{Binding IconSymbol}" />
-                                        <TextBlock Text="{Binding Name}" FontWeight="{Binding FontWeight}" TextWrapping="NoWrap" VerticalAlignment="Center" Margin="30,0,20,0" FontStyle="{Binding Name, Converter={StaticResource TextToFontStyleConverter}, ConverterParameter=Recycle\ Bin}" />
+                                        <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>
@@ -164,17 +187,21 @@
                             </ListView.ItemContainerStyle>
                             <ListView.HeaderTemplate>
                                 <DataTemplate>
-                                    <ToggleButton IsChecked="{Binding IsLeftPaneOpen, Mode=TwoWay}" Style="{StaticResource HamburgerToggleButton}" Margin="0" />
+                                    <ToggleButton Style="{StaticResource HamburgerToggleButton}" Margin="0" >
+                                        <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>
-                            <interactivity:Interaction.Behaviors>
-                                <core:DataTriggerBehavior Binding="{Binding IsLeftPaneOpen}" Value="True">
-                                    <core:ChangePropertyAction PropertyName="ItemTemplate" Value="{StaticResource Expanded}"/>
-                                </core:DataTriggerBehavior>
-                                <core:DataTriggerBehavior Binding="{Binding IsLeftPaneOpen}" Value="False">
-                                    <core:ChangePropertyAction PropertyName="ItemTemplate" Value="{StaticResource Collapsed}"/>
-                                </core:DataTriggerBehavior>
-                            </interactivity:Interaction.Behaviors>
                         </ListView>
                     </GridView.Header>
                 </GridView>
@@ -237,9 +264,15 @@
                 IsHitTestVisible="{Binding IsEditMode}" 
                 TextWrapping="NoWrap" 
                 VerticalAlignment="Center" 
-                Margin="0,0,30,0"
-                PlaceholderText="New group name..."/>
-            <SearchBox Grid.Column="2" PlaceholderText="Search..." Width="350" Height="40" SuggestionsRequested="SearchBox_OnSuggestionsRequested" SearchHistoryEnabled="False" ResultSuggestionChosen="SearchBox_OnResultSuggestionChosen" />
+                Margin="0,0,30,5"
+                PlaceholderText="New group name...">
+                <interactivity:Interaction.Behaviors>
+                    <core:DataTriggerBehavior Binding="{Binding IsEditMode}" Value="True">
+                        <actions:SetupFocusAction TargetObject="{Binding ElementName=TitleTextBox}" />
+                    </core:DataTriggerBehavior>
+                </interactivity:Interaction.Behaviors>
+            </TextBox>
+            <SearchBox Grid.Column="2" PlaceholderText="Search..." Width="350" Height="40" FontSize="18" SuggestionsRequested="SearchBox_OnSuggestionsRequested" SearchHistoryEnabled="False" ResultSuggestionChosen="SearchBox_OnResultSuggestionChosen" />
         </Grid>
     </Grid>
 </Page>
\ No newline at end of file
diff --git a/ModernKeePass/Pages/GroupDetailPage.xaml.cs b/ModernKeePass/Pages/GroupDetailPage.xaml.cs
index b280f92..582dbdd 100644
--- a/ModernKeePass/Pages/GroupDetailPage.xaml.cs
+++ b/ModernKeePass/Pages/GroupDetailPage.xaml.cs
@@ -8,6 +8,7 @@ using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Navigation;
 using ModernKeePass.Common;
+using ModernKeePass.Events;
 using ModernKeePass.ViewModels;
 
 // The Group Detail Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234229
@@ -62,12 +63,10 @@ namespace ModernKeePass.Pages
         {
             NavigationHelper.OnNavigatedTo(e);
 
-            if (!(e.Parameter is GroupVm)) return;
-            DataContext = (GroupVm) e.Parameter;
-            if (Model.IsEditMode)
-                Task.Factory.StartNew(
-                () => Dispatcher.RunAsync(CoreDispatcherPriority.Low,
-                    () => TitleTextBox.Focus(FocusState.Programmatic)));
+            if (e.Parameter is PasswordEventArgs)
+                DataContext = ((PasswordEventArgs) e.Parameter).RootGroup;
+            else if (e.Parameter is GroupVm)
+                DataContext = (GroupVm) e.Parameter;
         }
 
         protected override void OnNavigatedFrom(NavigationEventArgs e)
@@ -114,28 +113,9 @@ namespace ModernKeePass.Pages
             Frame.Navigate(typeof(EntryDetailPage), entry);
         }
 
-        private async void DeleteButton_Click(object sender, RoutedEventArgs e)
+        private void DeleteButton_Click(object sender, RoutedEventArgs e)
         {
-            // Create the message dialog and set its content
-            var messageDialog = new MessageDialog("Are you sure you want to delete the whole group and all its entries?");
-
-            // Add commands and set their callbacks; both buttons use the same callback function instead of inline event handlers
-            messageDialog.Commands.Add(new UICommand("Delete", delete =>
-            {
-                ToastNotificationHelper.ShowUndoToast("Group", Model);
-                Model.MarkForDelete();
-                if (Frame.CanGoBack) Frame.GoBack();
-            }));
-            messageDialog.Commands.Add(new UICommand("Cancel"));
-
-            // Set the command that will be invoked by default
-            messageDialog.DefaultCommandIndex = 1;
-
-            // Set the command to be invoked when escape is pressed
-            messageDialog.CancelCommandIndex = 1;
-
-            // Show the message dialog
-            await messageDialog.ShowAsync();
+            MessageDialogHelper.ShowDeleteConfirmationDialog("Are you sure you want to delete the whole group and all its entries?", Model, Frame);
         }
         
         private void SemanticZoom_ViewChangeStarted(object sender, SemanticZoomViewChangedEventArgs e)
@@ -164,22 +144,5 @@ namespace ModernKeePass.Pages
         }
 
         #endregion
-
-        private void EditButton_Click(object sender, RoutedEventArgs e)
-        {
-            BottomAppBar.IsOpen = false;
-            if (Model.IsEditMode)
-            {
-                Task.Factory.StartNew(
-                    () => Dispatcher.RunAsync(CoreDispatcherPriority.Low,
-                        () => TitleTextBox.Focus(FocusState.Programmatic)));
-            }
-            else
-            {
-                Task.Factory.StartNew(
-                    () => Dispatcher.RunAsync(CoreDispatcherPriority.Low,
-                        () => PageRoot.Focus(FocusState.Programmatic)));
-            }
-        }
     }
 }
diff --git a/ModernKeePass/MainPage.xaml b/ModernKeePass/Pages/MainPage.xaml
similarity index 96%
rename from ModernKeePass/MainPage.xaml
rename to ModernKeePass/Pages/MainPage.xaml
index c562222..ded151f 100644
--- a/ModernKeePass/MainPage.xaml
+++ b/ModernKeePass/Pages/MainPage.xaml
@@ -33,7 +33,7 @@
             SelectedItem="{Binding SelectedItem, Mode=TwoWay}"
             IsSynchronizedWithCurrentItem="False">
             <ListView.Header>
-                <TextBlock Text="ModernKeePass" FontWeight="Bold" FontSize="36" Margin="20" />
+                <TextBlock Text="{Binding Name}" FontWeight="Bold" FontSize="36" Margin="20" />
             </ListView.Header>
             <ListView.ItemTemplate>
                 <DataTemplate >
diff --git a/ModernKeePass/MainPage.xaml.cs b/ModernKeePass/Pages/MainPage.xaml.cs
similarity index 100%
rename from ModernKeePass/MainPage.xaml.cs
rename to ModernKeePass/Pages/MainPage.xaml.cs
diff --git a/ModernKeePass/Pages/NewDatabasePage.xaml b/ModernKeePass/Pages/NewDatabasePage.xaml
index a75b2db..968302e 100644
--- a/ModernKeePass/Pages/NewDatabasePage.xaml
+++ b/ModernKeePass/Pages/NewDatabasePage.xaml
@@ -7,6 +7,7 @@
     xmlns:local="using:ModernKeePass.Controls"
     xmlns:converters="using:ModernKeePass.Converters"
     xmlns:viewModels="using:ModernKeePass.ViewModels"
+    xmlns:interactivity="using:Microsoft.Xaml.Interactivity" xmlns:Core="using:Microsoft.Xaml.Interactions.Core" 
     mc:Ignorable="d">
     <Page.Resources>
         <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
@@ -21,12 +22,18 @@
         <TextBlock Style="{StaticResource HeaderTextBlockStyle}" Margin="0,-20,0,20">New</TextBlock>
         <HyperlinkButton Content="Create new..." Click="ButtonBase_OnClick" />
         <TextBlock Style="{StaticResource BodyTextBlockStyle}" Margin="15,0,0,30">Create a new password database to the location of your chosing.</TextBlock>
-        <Border HorizontalAlignment="Left" BorderThickness="1" BorderBrush="AliceBlue" Width="350" Visibility="{Binding ShowPasswordBox, Converter={StaticResource BooleanToVisibilityConverter}}">
+        <Border HorizontalAlignment="Left" BorderThickness="1" BorderBrush="AliceBlue" Width="550" Visibility="{Binding ShowPasswordBox, Converter={StaticResource BooleanToVisibilityConverter}}">
             <StackPanel>
                 <TextBlock Margin="25,10,0,10" Text="{Binding Name}" />
-                <local:OpenDatabaseUserControl Password="{Binding Password, Mode=TwoWay}" CreateNew="True"  ValidationChecked="PasswordUserControl_PasswordChecked" />
+                <local:OpenDatabaseUserControl Password="{Binding Password, Mode=TwoWay}" CreateNew="True" >
+                    <interactivity:Interaction.Behaviors>
+                        <Core:EventTriggerBehavior EventName="ValidationChecked">
+                            <Core:NavigateToPageAction TargetPage="ModernKeePass.Pages.GroupDetailPage" />
+                        </Core:EventTriggerBehavior>
+                    </interactivity:Interaction.Behaviors>
+                </local:OpenDatabaseUserControl>
                 <TextBlock Margin="25,0,0,10">Password complexity</TextBlock>
-                <ProgressBar Margin="25,0,0,10" Value="{Binding PasswordComplexityIndicator, ConverterParameter=0\,128, Converter={StaticResource ProgressBarLegalValuesConverter}}" Maximum="128" Width="300" HorizontalAlignment="Left" Foreground="{Binding PasswordComplexityIndicator, ConverterParameter=128, Converter={StaticResource DoubleToForegroungBrushComplexityConverter}}" />
+                <ProgressBar Margin="25,0,0,10" Value="{Binding PasswordComplexityIndicator, ConverterParameter=0\,128, Converter={StaticResource ProgressBarLegalValuesConverter}}" Maximum="128" Width="500" HorizontalAlignment="Left" Foreground="{Binding PasswordComplexityIndicator, ConverterParameter=128, Converter={StaticResource DoubleToForegroungBrushComplexityConverter}}" />
             </StackPanel>
         </Border>
     </StackPanel>
diff --git a/ModernKeePass/Pages/NewDatabasePage.xaml.cs b/ModernKeePass/Pages/NewDatabasePage.xaml.cs
index 7cbf989..4389d6c 100644
--- a/ModernKeePass/Pages/NewDatabasePage.xaml.cs
+++ b/ModernKeePass/Pages/NewDatabasePage.xaml.cs
@@ -44,10 +44,5 @@ namespace ModernKeePass.Pages
             if (file == null) return;
             Model.OpenFile(file);
         }
-
-        private void PasswordUserControl_PasswordChecked(object sender, PasswordEventArgs e)
-        {
-            _mainFrame.Navigate(typeof(GroupDetailPage), e.RootGroup);
-        }
     }
 }
diff --git a/ModernKeePass/Pages/OpenDatabasePage.xaml b/ModernKeePass/Pages/OpenDatabasePage.xaml
index 1f192b5..89e8964 100644
--- a/ModernKeePass/Pages/OpenDatabasePage.xaml
+++ b/ModernKeePass/Pages/OpenDatabasePage.xaml
@@ -6,6 +6,7 @@
     xmlns:viewModels="using:ModernKeePass.ViewModels"
     xmlns:local="using:ModernKeePass.Controls"
     xmlns:converters="using:ModernKeePass.Converters"
+    xmlns:interactivity="using:Microsoft.Xaml.Interactivity" xmlns:Core="using:Microsoft.Xaml.Interactions.Core" 
     x:Class="ModernKeePass.Pages.OpenDatabasePage"
     mc:Ignorable="d">
     <Page.Resources>
@@ -24,7 +25,13 @@
         <Border HorizontalAlignment="Left" BorderThickness="1" BorderBrush="AliceBlue" Width="550" Visibility="{Binding ShowPasswordBox, Converter={StaticResource BooleanToVisibilityConverter}}">
             <StackPanel>
                 <TextBlock Margin="25,10,0,10" Text="{Binding Name}" />
-                <local:OpenDatabaseUserControl ValidationChecked="PasswordUserControl_PasswordChecked" />
+                <local:OpenDatabaseUserControl>
+                    <interactivity:Interaction.Behaviors>
+                        <Core:EventTriggerBehavior EventName="ValidationChecked">
+                            <Core:NavigateToPageAction TargetPage="ModernKeePass.Pages.GroupDetailPage" />
+                        </Core:EventTriggerBehavior>
+                    </interactivity:Interaction.Behaviors>
+                </local:OpenDatabaseUserControl>
             </StackPanel>
         </Border>
     </StackPanel>
diff --git a/ModernKeePass/Pages/OpenDatabasePage.xaml.cs b/ModernKeePass/Pages/OpenDatabasePage.xaml.cs
index f908901..8395066 100644
--- a/ModernKeePass/Pages/OpenDatabasePage.xaml.cs
+++ b/ModernKeePass/Pages/OpenDatabasePage.xaml.cs
@@ -45,10 +45,5 @@ namespace ModernKeePass.Pages
             if (file == null) return;
             Model.OpenFile(file);
         }
-
-        private void PasswordUserControl_PasswordChecked(object sender, PasswordEventArgs e)
-        {
-            _mainFrame.Navigate(typeof(GroupDetailPage), e.RootGroup);
-        }
     }
 }
diff --git a/ModernKeePass/Pages/RecentDatabasesPage.xaml b/ModernKeePass/Pages/RecentDatabasesPage.xaml
index 6b0b55c..5c902af 100644
--- a/ModernKeePass/Pages/RecentDatabasesPage.xaml
+++ b/ModernKeePass/Pages/RecentDatabasesPage.xaml
@@ -6,6 +6,7 @@
     xmlns:viewModels="using:ModernKeePass.ViewModels"
     xmlns:local="using:ModernKeePass.Controls"
     xmlns:converters="using:ModernKeePass.Converters" 
+    xmlns:interactivity="using:Microsoft.Xaml.Interactivity" xmlns:Core="using:Microsoft.Xaml.Interactions.Core" 
     x:Class="ModernKeePass.Pages.RecentDatabasesPage"
     mc:Ignorable="d">
     <Page.Resources>
@@ -16,7 +17,9 @@
         <viewModels:RecentVm/>
     </Page.DataContext>
     <StackPanel Background="{StaticResource ApplicationPageBackgroundThemeBrush}">
-        <TextBlock Style="{StaticResource HeaderTextBlockStyle}" Margin="0,-20,0,20">Recent</TextBlock>
+        <TextBlock Style="{StaticResource HeaderTextBlockStyle}" Margin="0,-20,0,20">
+            <Run Text="Recent"/>
+        </TextBlock>
         <ListView 
             ItemsSource="{Binding Source={StaticResource RecentItemsSource}}"
             SelectedItem="{Binding SelectedItem, Mode=TwoWay}"
@@ -26,7 +29,13 @@
                     <StackPanel Margin="10,0,10,0">
                         <TextBlock Text="{Binding Name}" Padding="5,0,0,0" />
                         <TextBlock Text="{Binding Path}" Padding="5,0,0,0" FontSize="10" />
-                        <local:OpenDatabaseUserControl Margin="0,10,0,0" Visibility="{Binding IsSelected, Converter={StaticResource BooleanToVisibilityConverter}}" ValidationChecking="OpenDatabaseUserControl_OnValidationChecking" ValidationChecked="PasswordUserControl_PasswordChecked" />
+                        <local:OpenDatabaseUserControl x:Name="DatabaseUserControl" Margin="0,10,0,0" Visibility="{Binding IsSelected, Converter={StaticResource BooleanToVisibilityConverter}}" ValidationChecking="OpenDatabaseUserControl_OnValidationChecking" >
+                            <interactivity:Interaction.Behaviors>
+                                <Core:EventTriggerBehavior EventName="ValidationChecked">
+                                    <Core:NavigateToPageAction TargetPage="ModernKeePass.Pages.GroupDetailPage" />
+                                </Core:EventTriggerBehavior>
+                            </interactivity:Interaction.Behaviors>
+                        </local:OpenDatabaseUserControl>
                     </StackPanel>
                 </DataTemplate>
             </ListView.ItemTemplate>
diff --git a/ModernKeePass/Pages/RecentDatabasesPage.xaml.cs b/ModernKeePass/Pages/RecentDatabasesPage.xaml.cs
index c3c60dc..ae77fa8 100644
--- a/ModernKeePass/Pages/RecentDatabasesPage.xaml.cs
+++ b/ModernKeePass/Pages/RecentDatabasesPage.xaml.cs
@@ -2,7 +2,6 @@
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Navigation;
-using ModernKeePass.Events;
 using ModernKeePass.ViewModels;
 
 // Pour en savoir plus sur le modèle d'élément Page vierge, consultez la page http://go.microsoft.com/fwlink/?LinkId=234238
@@ -29,11 +28,6 @@ namespace ModernKeePass.Pages
             _mainFrame = e.Parameter as Frame;
         }
         
-        private void PasswordUserControl_PasswordChecked(object sender, PasswordEventArgs e)
-        {
-            _mainFrame.Navigate(typeof(GroupDetailPage), e.RootGroup);
-        }
-
         private void OpenDatabaseUserControl_OnValidationChecking(object sender, EventArgs e)
         {
             var app = (App)Application.Current;
diff --git a/ModernKeePass/ViewModels/AboutVm.cs b/ModernKeePass/ViewModels/AboutVm.cs
index ffe8d16..15efb12 100644
--- a/ModernKeePass/ViewModels/AboutVm.cs
+++ b/ModernKeePass/ViewModels/AboutVm.cs
@@ -4,6 +4,8 @@ namespace ModernKeePass.ViewModels
 {
     public class AboutVm
     {
+        public string Name { get; } = Package.Current.DisplayName;
+
         public string Version
         {
             get
@@ -11,7 +13,7 @@ namespace ModernKeePass.ViewModels
                 var package = Package.Current;
                 var version = package.Id.Version;
 
-                return $"{package.DisplayName} version {version.Major}.{version.Minor}";
+                return $"{version.Major}.{version.Minor}";
             }
         }
     }
diff --git a/ModernKeePass/ViewModels/EntryVm.cs b/ModernKeePass/ViewModels/EntryVm.cs
index e82c106..86e7996 100644
--- a/ModernKeePass/ViewModels/EntryVm.cs
+++ b/ModernKeePass/ViewModels/EntryVm.cs
@@ -195,5 +195,10 @@ namespace ModernKeePass.ViewModels
             ParentGroup.Entries.Add(this);
         }
 
+        public void Save()
+        {
+            var app = (App)Application.Current;
+            app.Database.Save();
+        }
     }
 }
diff --git a/ModernKeePass/ViewModels/GroupVm.cs b/ModernKeePass/ViewModels/GroupVm.cs
index 524f6f7..a2f3a7e 100644
--- a/ModernKeePass/ViewModels/GroupVm.cs
+++ b/ModernKeePass/ViewModels/GroupVm.cs
@@ -51,13 +51,7 @@ namespace ModernKeePass.ViewModels
                 return result == Symbol.More ? Symbol.Folder : result;
             }
         }
-
-        public bool IsLeftPaneOpen
-        {
-            get { return _isLeftPaneOpen; }
-            set { SetProperty(ref _isLeftPaneOpen, value); }
-        }
-
+        
         public bool IsEditMode
         {
             get { return _isEditMode; }
@@ -113,5 +107,11 @@ namespace ModernKeePass.ViewModels
         {
             ParentGroup.Groups.Add(this);
         }
+
+        public void Save()
+        {
+            var app = (App)Application.Current;
+            app.Database.Save();
+        }
     }
 }
diff --git a/ModernKeePass/ViewModels/MainVm.cs b/ModernKeePass/ViewModels/MainVm.cs
index e8f6e29..cf935fe 100644
--- a/ModernKeePass/ViewModels/MainVm.cs
+++ b/ModernKeePass/ViewModels/MainVm.cs
@@ -1,5 +1,6 @@
 using System.Collections.ObjectModel;
 using System.Linq;
+using Windows.ApplicationModel;
 using Windows.Storage.AccessCache;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
@@ -13,6 +14,8 @@ namespace ModernKeePass.ViewModels
         private IOrderedEnumerable<IGrouping<int, MainMenuItemVm>> _mainMenuItems;
         private MainMenuItemVm _selectedItem;
 
+        public string Name { get; } = Package.Current.DisplayName;
+
         public IOrderedEnumerable<IGrouping<int, MainMenuItemVm>> MainMenuItems
         {
             get { return _mainMenuItems; }
diff --git a/ModernKeePass/ViewModels/RecentVm.cs b/ModernKeePass/ViewModels/RecentVm.cs
index a98cc78..64b5ba8 100644
--- a/ModernKeePass/ViewModels/RecentVm.cs
+++ b/ModernKeePass/ViewModels/RecentVm.cs
@@ -36,6 +36,7 @@ namespace ModernKeePass.ViewModels
 
         public RecentVm()
         {
+            // TODO: opening the files actually changes the MRU order
             var mru = StorageApplicationPermissions.MostRecentlyUsedList;
             foreach (var entry in mru.Entries)
             {