diff --git a/ModernKeePass/ViewModels/EntryDetailVm.cs b/ModernKeePass/ViewModels/EntryDetailVm.cs
index 11e1f28..6c3e00e 100644
--- a/ModernKeePass/ViewModels/EntryDetailVm.cs
+++ b/ModernKeePass/ViewModels/EntryDetailVm.cs
@@ -205,12 +205,6 @@ namespace ModernKeePass.ViewModels
             }
         }
         
-        public bool IsEditMode
-        {
-            get { return IsCurrentEntry && _isEditMode; }
-            set { Set(() => IsEditMode, ref _isEditMode, value); }
-        }
-        
         public RelayCommand SaveCommand { get; }
         public RelayCommand<string> MoveCommand { get; }
         public RelayCommand RestoreCommand { get; }
@@ -238,7 +232,6 @@ namespace ModernKeePass.ViewModels
         private EntryVm _current;
         private int _selectedIndex;
         private int _additionalFieldSelectedIndex = -1;
-        private bool _isEditMode;
         private bool _isDirty;
 
         public EntryDetailVm(IMediator mediator, INavigationService navigation, IResourceProxy resource, IDialogService dialog, INotificationService notification, IFileProxy file, ICryptographyClient cryptography, IDateTime dateTime)
diff --git a/ModernKeePass/ViewModels/GroupDetailVm.cs b/ModernKeePass/ViewModels/GroupDetailVm.cs
index cdeb2bc..53702af 100644
--- a/ModernKeePass/ViewModels/GroupDetailVm.cs
+++ b/ModernKeePass/ViewModels/GroupDetailVm.cs
@@ -80,7 +80,7 @@ namespace ModernKeePass.ViewModels
             }
         }
 
-        public string ParentGroupName => _parent?.Title;
+        public string ParentGroupName => _parent == null ? Database.Name : _parent.Title;
 
         public bool IsRecycleOnDelete => Database.IsRecycleBinEnabled && !IsInRecycleBin;
 
diff --git a/ModernKeePass/ViewModels/ViewModelLocator.cs b/ModernKeePass/ViewModels/ViewModelLocator.cs
index 65cab32..f5959ca 100644
--- a/ModernKeePass/ViewModels/ViewModelLocator.cs
+++ b/ModernKeePass/ViewModels/ViewModelLocator.cs
@@ -15,9 +15,6 @@
 using System;
 using CommonServiceLocator;
 using GalaSoft.MvvmLight.Ioc;
-using Microsoft.Extensions.DependencyInjection;
-using ModernKeePass.Domain.Interfaces;
-using GalaSoft.MvvmLight;
 
 namespace ModernKeePass.ViewModels
 {
@@ -32,18 +29,6 @@ namespace ModernKeePass.ViewModels
         /// </summary>
         public ViewModelLocator()
         {
-            if (ViewModelBase.IsInDesignModeStatic)
-            {
-                // Create design time view services and models
-                //SimpleIoc.Default.Register<IDataService, DesignDataService>();
-            }
-            else
-            {
-                // Create run time view services and models
-                //SimpleIoc.Default.Register<IDataService, DataService>();IDataService
-                SimpleIoc.Default.Register(() => App.Services.GetRequiredService<IDateTime>());
-            }
-
             SimpleIoc.Default.Register<SettingsVm>();
             SimpleIoc.Default.Register<MainVm>();
             SimpleIoc.Default.Register<GroupDetailVm>();
diff --git a/ModernKeePass/Views/EntryDetailPage.xaml b/ModernKeePass/Views/EntryDetailPage.xaml
index e363082..3feaf44 100644
--- a/ModernKeePass/Views/EntryDetailPage.xaml
+++ b/ModernKeePass/Views/EntryDetailPage.xaml
@@ -32,6 +32,7 @@
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
+
             <Grid Grid.Column="1">
                 <Hub x:Name="Hub" Padding="0">
                     <Hub.Resources>
@@ -51,6 +52,15 @@
                                             <Setter Property="FontSize" Value="18"/>
                                         </Style>
                                     </StackPanel.Resources>
+                                    <TextBlock x:Uid="EntryTitle" Style="{StaticResource EntryTextBlockStyle}" />
+                                    <local:TextBoxWithButton x:Uid="TitleTextBox" Text="{Binding Title, Mode=TwoWay}" Style="{StaticResource TextBoxWithButtonStyle}" ButtonContent="&#xE16F;" IsEnabled="{Binding IsCurrentEntry}">
+                                        <interactivity:Interaction.Behaviors>
+                                            <core:EventTriggerBehavior EventName="ButtonClick">
+                                                <actions:ClipboardAction Text="{Binding Title}" />
+                                                <actions:ToastAction x:Uid="ToastCopyTitle" Title="{Binding Title}" />
+                                            </core:EventTriggerBehavior>
+                                        </interactivity:Interaction.Behaviors>
+                                    </local:TextBoxWithButton>
                                     <TextBlock x:Uid="EntryLogin" Style="{StaticResource EntryTextBlockStyle}" />
                                     <local:TextBoxWithButton x:Uid="LoginTextBox" Text="{Binding UserName, Mode=TwoWay}" Style="{StaticResource TextBoxWithButtonStyle}" ButtonContent="&#xE16F;" IsEnabled="{Binding IsCurrentEntry}">
                                         <interactivity:Interaction.Behaviors>
@@ -220,57 +230,35 @@
         <Grid Grid.Row="0" Background="{ThemeResource AppBarBackgroundThemeBrush}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="{StaticResource MenuWidthGridLength}"/>
-                <ColumnDefinition Width="{StaticResource MenuWidthGridLength}"/>
+                <ColumnDefinition Width="Auto"/>
                 <ColumnDefinition Width="Auto"/>
                 <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
             <Button Grid.Column="0" 
-                    Command="{Binding GoBackCommand}"
-                    Height="{StaticResource MenuHeight}"
-                    Width="{StaticResource MenuWidth}"
-                    AutomationProperties.Name="Back"
-                    AutomationProperties.AutomationId="BackButton"
-                    AutomationProperties.ItemType="Navigation Button"
-                    Style="{StaticResource NoBorderButtonStyle}">
+                Command="{Binding GoBackCommand}"
+                Height="{StaticResource MenuHeight}"
+                Width="{StaticResource MenuWidth}"
+                AutomationProperties.Name="Back"
+                AutomationProperties.AutomationId="BackButton"
+                AutomationProperties.ItemType="Navigation Button"
+                Style="{StaticResource NoBorderButtonStyle}">
                 <SymbolIcon Symbol="Back" />
             </Button>
             <Button Grid.Column="1" 
                 Height="{StaticResource MenuHeight}"
-                Width="{StaticResource MenuWidth}"
                 Command="{Binding GoToParentCommand}"
                 Style="{StaticResource NoBorderButtonStyle}">
-                <SymbolIcon Symbol="Up" />
+                <StackPanel Orientation="Horizontal">
+                    <SymbolIcon Symbol="Up" />
+                    <TextBlock x:Name="UpButtonText" Margin="10,2,0,0" Text="{Binding ParentGroupName}" FontStyle="Italic" HorizontalAlignment="Center" />
+                </StackPanel>
                 <ToolTipService.ToolTip>
                     <ToolTip Content="{Binding ParentGroupName}" />
                 </ToolTipService.ToolTip>
             </Button>
-            <Viewbox Grid.Column="2" MaxHeight="200">
-                <SymbolIcon Symbol="{Binding Icon}" Width="100" Height="70"  />
-            </Viewbox>
-            <TextBox Grid.Column="3"
-                x:Uid="EntryTitle"
-                x:Name="TitleTextBox"
-                Text="{Binding Title, Mode=TwoWay}" 
-                Background="Transparent"
-                IsHitTestVisible="{Binding IsEditMode}"
-                FontSize="20"
-                FontWeight="Light"
-                TextWrapping="NoWrap" 
-                VerticalAlignment="Center">
-                <interactivity:Interaction.Behaviors>
-                    <core:DataTriggerBehavior Binding="{Binding IsEditMode}" Value="True">
-                        <actions:SetupFocusAction TargetObject="{Binding ElementName=TitleTextBox}" />
-                        <core:ChangePropertyAction TargetObject="{Binding ElementName=TitleTextBox}" PropertyName="BorderThickness" Value="2" />
-                    </core:DataTriggerBehavior>
-                    <core:DataTriggerBehavior Binding="{Binding IsEditMode}" Value="False">
-                        <core:ChangePropertyAction TargetObject="{Binding ElementName=TitleTextBox}" PropertyName="BorderThickness" Value="0" />
-                    </core:DataTriggerBehavior>
-                </interactivity:Interaction.Behaviors>
-            </TextBox>
             <controls:TopMenuUserControl 
                 x:Name="TopMenu" Grid.Column="4"
-                IsEditButtonChecked="{Binding IsEditMode, Mode=TwoWay}"
                 MoveButtonVisibility="{Binding IsCurrentEntry, Converter={StaticResource BooleanToVisibilityConverter}}"
                 RestoreButtonVisibility="{Binding IsCurrentEntry, Converter={StaticResource InverseBooleanToVisibilityConverter}}"
                 SaveCommand="{Binding SaveCommand}"
@@ -291,6 +279,9 @@
                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Hub" Storyboard.TargetProperty="Margin">
                             <DiscreteObjectKeyFrame KeyTime="0" Value="-30,0,0,0"/>
                         </ObjectAnimationUsingKeyFrames>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="UpButtonText" Storyboard.TargetProperty="Visibility">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/>
+                        </ObjectAnimationUsingKeyFrames>
                     </Storyboard>
                 </VisualState>
                 <VisualState x:Name="Medium">
@@ -298,6 +289,9 @@
                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Hub" Storyboard.TargetProperty="Margin">
                             <DiscreteObjectKeyFrame KeyTime="0" Value="0,0,0,0"/>
                         </ObjectAnimationUsingKeyFrames>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="UpButtonText" Storyboard.TargetProperty="Visibility">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="Visible"/>
+                        </ObjectAnimationUsingKeyFrames>
                     </Storyboard>
                 </VisualState>
                 <VisualState x:Name="Large">
@@ -305,6 +299,9 @@
                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Hub" Storyboard.TargetProperty="Margin">
                             <DiscreteObjectKeyFrame KeyTime="0" Value="0,0,0,0"/>
                         </ObjectAnimationUsingKeyFrames>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="UpButtonText" Storyboard.TargetProperty="Visibility">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="Visible"/>
+                        </ObjectAnimationUsingKeyFrames>
                     </Storyboard>
                 </VisualState>
             </VisualStateGroup>
diff --git a/ModernKeePass/Views/EntryDetailPage.xaml.cs b/ModernKeePass/Views/EntryDetailPage.xaml.cs
index b9aed16..8612cea 100644
--- a/ModernKeePass/Views/EntryDetailPage.xaml.cs
+++ b/ModernKeePass/Views/EntryDetailPage.xaml.cs
@@ -28,7 +28,6 @@ namespace ModernKeePass.Views
             if (args != null)
             {
                 await Model.Initialize(args.Id);
-                Model.IsEditMode = args.IsNew;
             }
         }
 
diff --git a/ModernKeePass/Views/GroupDetailPage.xaml b/ModernKeePass/Views/GroupDetailPage.xaml
index b533091..7a7b7e1 100644
--- a/ModernKeePass/Views/GroupDetailPage.xaml
+++ b/ModernKeePass/Views/GroupDetailPage.xaml
@@ -174,6 +174,7 @@
                 Grid.Column="0"
                 x:Name="HamburgerMenu"
                 x:Uid="GroupsLeftListView" 
+                HeaderLabel="{Binding Title}"
                 ItemsSource="{Binding Groups}" 
                 CanDragItems="{Binding IsEditMode}"
                 ActionButtonCommand="{Binding CreateGroupCommand}"
@@ -189,7 +190,7 @@
         <Grid Grid.Row="0" Background="{ThemeResource AppBarBackgroundThemeBrush}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="{StaticResource MenuWidthGridLength}"/>
-                <ColumnDefinition Width="{StaticResource MenuWidthGridLength}"/>
+                <ColumnDefinition Width="Auto"/>
                 <ColumnDefinition Width="Auto"/>
                 <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="Auto"/>
@@ -206,42 +207,25 @@
             </Button>
             <Button Grid.Column="1" 
                 Height="{StaticResource MenuHeight}"
-                Width="{StaticResource MenuWidth}"
                 Command="{Binding GoToParentCommand}"
                 Style="{StaticResource NoBorderButtonStyle}">
-                <SymbolIcon Symbol="Up" />
+                <StackPanel Orientation="Horizontal">
+                    <SymbolIcon Symbol="Up" />
+                    <TextBlock x:Name="UpButtonText" Margin="10,2,0,0" Text="{Binding ParentGroupName}" FontStyle="Italic" HorizontalAlignment="Center" />
+                </StackPanel>
                 <ToolTipService.ToolTip>
                     <ToolTip Content="{Binding ParentGroupName}" />
                 </ToolTipService.ToolTip>
             </Button>
-            <Viewbox Grid.Column="2" MaxHeight="200" Visibility="{Binding IsEditMode, Converter={StaticResource BooleanToVisibilityConverter}}">
+            <!--<Viewbox Grid.Column="2" MaxHeight="200" Visibility="{Binding IsEditMode, Converter={StaticResource BooleanToVisibilityConverter}}">
                 <userControls:SymbolPickerUserControl Width="100" Height="70" SelectedSymbol="{Binding Icon, Mode=TwoWay}" />
             </Viewbox>
             <Viewbox Grid.Column="2" MaxHeight="200" Visibility="{Binding IsEditMode, Converter={StaticResource InverseBooleanToVisibilityConverter}}">
                 <SymbolIcon Symbol="{Binding Icon}" Width="100" Height="70"  />
-            </Viewbox>
-            <TextBox Grid.Column="3"
-                    x:Uid="GroupTitle"
-                    x:Name="TitleTextBox"
-                    Text="{Binding Title, Mode=TwoWay}" 
-                    Background="Transparent"
-                    IsHitTestVisible="{Binding IsEditMode}"
-                    FontSize="20"
-                    FontWeight="Light"
-                    TextWrapping="NoWrap" 
-                    VerticalAlignment="Center">
-                <interactivity:Interaction.Behaviors>
-                    <core:DataTriggerBehavior Binding="{Binding IsEditMode}" Value="True">
-                        <actions:SetupFocusAction TargetObject="{Binding ElementName=TitleTextBox}" />
-                        <core:ChangePropertyAction TargetObject="{Binding ElementName=TitleTextBox}" PropertyName="BorderThickness" Value="2" />
-                    </core:DataTriggerBehavior>
-                    <core:DataTriggerBehavior Binding="{Binding IsEditMode}" Value="False">
-                        <core:ChangePropertyAction TargetObject="{Binding ElementName=TitleTextBox}" PropertyName="BorderThickness" Value="0" />
-                    </core:DataTriggerBehavior>
-                </interactivity:Interaction.Behaviors>
-            </TextBox>
+            </Viewbox>-->
             <userControls:TopMenuUserControl x:Name="TopMenu" Grid.Column="4"
                 SortButtonVisibility="{Binding IsEditMode, Converter={StaticResource BooleanToVisibilityConverter}}"
+                EditButtonVisibility="Visible"
                 IsEditButtonChecked="{Binding IsEditMode, Mode=TwoWay}"
                 SaveCommand="{Binding SaveCommand}"
                 MoveCommand="{Binding MoveCommand}"
@@ -269,6 +253,9 @@
                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SemanticZoom" Storyboard.TargetProperty="Margin">
                             <DiscreteObjectKeyFrame KeyTime="0" Value="-60,0,0,0"/>
                         </ObjectAnimationUsingKeyFrames>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="UpButtonText" Storyboard.TargetProperty="Visibility">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/>
+                        </ObjectAnimationUsingKeyFrames>
                     </Storyboard>
                 </VisualState>
                 <VisualState x:Name="Medium">
@@ -279,6 +266,9 @@
                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SemanticZoom" Storyboard.TargetProperty="Margin">
                             <DiscreteObjectKeyFrame KeyTime="0" Value="0,0,0,0"/>
                         </ObjectAnimationUsingKeyFrames>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="UpButtonText" Storyboard.TargetProperty="Visibility">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="Visible"/>
+                        </ObjectAnimationUsingKeyFrames>
                     </Storyboard>
                 </VisualState>
                 <VisualState x:Name="Large">
@@ -292,6 +282,9 @@
                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SemanticZoom" Storyboard.TargetProperty="Margin">
                             <DiscreteObjectKeyFrame KeyTime="0" Value="0,0,0,0"/>
                         </ObjectAnimationUsingKeyFrames>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="UpButtonText" Storyboard.TargetProperty="Visibility">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="Visible"/>
+                        </ObjectAnimationUsingKeyFrames>
                     </Storyboard>
                 </VisualState>
             </VisualStateGroup>
diff --git a/ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml b/ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml
index b9a57ba..b393e1f 100644
--- a/ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml
+++ b/ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml
@@ -61,6 +61,9 @@
         </Grid.RowDefinitions>
         <StackPanel Orientation="Horizontal">
             <ToggleButton x:Name="HamburgerButton" Style="{StaticResource HamburgerToggleButton}" IsChecked="{Binding IsOpen, ElementName=UserControl, Mode=TwoWay}" Unchecked="ToggleButton_OnUnchecked">
+                <ToolTipService.ToolTip>
+                    <ToolTip Content="{Binding HeaderLabel, ElementName=UserControl}" />
+                </ToolTipService.ToolTip>
                 <interactivity:Interaction.Behaviors>
                     <core:EventTriggerBehavior EventName="Checked">
                         <core:GoToStateAction StateName="Expanded" />
diff --git a/ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml.cs b/ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml.cs
index 4d4d824..22db298 100644
--- a/ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml.cs
+++ b/ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Windows.Input;
 using Windows.System;
 using Windows.UI.Xaml;
@@ -26,7 +25,7 @@ namespace ModernKeePass.Views.UserControls
                 typeof(string),
                 typeof(HamburgerMenuUserControl),
                 new PropertyMetadata("Header", (o, args) => { }));
-
+        
         public string ButtonLabel
         {
             get { return (string)GetValue(ButtonLabelProperty); }
diff --git a/ModernKeePass/Views/UserControls/TopMenuUserControl.xaml b/ModernKeePass/Views/UserControls/TopMenuUserControl.xaml
index f00cae7..db4534f 100644
--- a/ModernKeePass/Views/UserControls/TopMenuUserControl.xaml
+++ b/ModernKeePass/Views/UserControls/TopMenuUserControl.xaml
@@ -98,7 +98,7 @@
                     </MenuFlyout>
                 </Button.Flyout>
             </Button>
-            <ToggleButton Command="{Binding EditCommand, ElementName=UserControl}" IsChecked="{Binding IsEditButtonChecked, ElementName=UserControl, Mode=TwoWay}" Checked="EditButton_Click" Style="{StaticResource MenuToggleButtonStyle}">
+            <ToggleButton Visibility="{Binding EditButtonVisibility, ElementName=UserControl}" Command="{Binding EditCommand, ElementName=UserControl}" IsChecked="{Binding IsEditButtonChecked, ElementName=UserControl, Mode=TwoWay}" Checked="EditButton_Click" Style="{StaticResource MenuToggleButtonStyle}">
                 <SymbolIcon Symbol="Edit">
                     <ToolTipService.ToolTip>
                         <ToolTip x:Uid="TopMenuEditButton" />
@@ -151,7 +151,7 @@
                 <MenuFlyout Opening="OverflowFlyout_OnOpening">
                     <MenuFlyoutItem x:Uid="TopMenuSaveFlyout" x:Name="SaveFlyout" />
                     <MenuFlyoutItem x:Uid="TopMenuRestoreFlyout" x:Name="RestoreFlyout" Visibility="{Binding RestoreButtonVisibility, ElementName=UserControl}" />
-                    <ToggleMenuFlyoutItem x:Uid="TopMenuEditFlyout" x:Name="EditFlyout" IsChecked="{Binding IsEditButtonChecked, ElementName=UserControl, Mode=TwoWay}" Click="EditButton_Click" />
+                    <ToggleMenuFlyoutItem x:Uid="TopMenuEditFlyout" x:Name="EditFlyout" Visibility="{Binding EditButtonVisibility, ElementName=UserControl}" IsChecked="{Binding IsEditButtonChecked, ElementName=UserControl, Mode=TwoWay}" Click="EditButton_Click" />
                     <MenuFlyoutItem x:Uid="TopMenuDeleteFlyout" x:Name="DeleteFlyout" />
                     <MenuFlyoutItem x:Uid="TopMenuSortEntriesFlyout" x:Name="SortEntriesFlyout" Visibility="{Binding SortButtonVisibility, ElementName=UserControl}" />
                     <MenuFlyoutItem x:Uid="TopMenuSortGroupsFlyout" x:Name="SortGroupsFlyout" Visibility="{Binding SortButtonVisibility, ElementName=UserControl}" />
diff --git a/ModernKeePass/Views/UserControls/TopMenuUserControl.xaml.cs b/ModernKeePass/Views/UserControls/TopMenuUserControl.xaml.cs
index a0dde29..3232350 100644
--- a/ModernKeePass/Views/UserControls/TopMenuUserControl.xaml.cs
+++ b/ModernKeePass/Views/UserControls/TopMenuUserControl.xaml.cs
@@ -39,6 +39,18 @@ namespace ModernKeePass.Views.UserControls
                 typeof(TopMenuUserControl),
                 new PropertyMetadata(null, (o, args) => { }));
 
+        public Visibility EditButtonVisibility
+        {
+            get { return (Visibility)GetValue(EditButtonVisibilityProperty); }
+            set { SetValue(EditButtonVisibilityProperty, value); }
+        }
+        public static readonly DependencyProperty EditButtonVisibilityProperty =
+            DependencyProperty.Register(
+                nameof(EditButtonVisibility),
+                typeof(Visibility),
+                typeof(TopMenuUserControl),
+                new PropertyMetadata(Visibility.Collapsed, (o, args) => { }));
+
         public ICommand DeleteCommand
         {
             get { return (ICommand)GetValue(DeleteCommandProperty); }
diff --git a/WinAppCommon/Strings/en-US/Resources.resw b/WinAppCommon/Strings/en-US/Resources.resw
index fd4b024..de58bf3 100644
--- a/WinAppCommon/Strings/en-US/Resources.resw
+++ b/WinAppCommon/Strings/en-US/Resources.resw
@@ -372,9 +372,6 @@
   <data name="GroupsLeftListView.ButtonLabel" xml:space="preserve">
     <value>New group</value>
   </data>
-  <data name="GroupsLeftListView.HeaderLabel" xml:space="preserve">
-    <value>Groups</value>
-  </data>
   <data name="HistoryLeftListView.HeaderLabel" xml:space="preserve">
     <value>History</value>
   </data>
@@ -453,9 +450,6 @@
   <data name="ToastUpdateDatabase.Title" xml:space="preserve">
     <value>Composite Key</value>
   </data>
-  <data name="EntryTitle.PlaceholderText" xml:space="preserve">
-    <value>New entry name...</value>
-  </data>
   <data name="SearchButtonLabel.Text" xml:space="preserve">
     <value>Search</value>
   </data>
@@ -570,4 +564,13 @@
   <data name="PasswordGenerationButton.ButtonContent" xml:space="preserve">
     <value>Random</value>
   </data>
+  <data name="EntryTitle.Text" xml:space="preserve">
+    <value>Title</value>
+  </data>
+  <data name="TitleTextBox.ButtonTooltip" xml:space="preserve">
+    <value>Copy title</value>
+  </data>
+  <data name="ToastCopyTitle.Message" xml:space="preserve">
+    <value>Title copied to clipboard</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WinAppCommon/Strings/fr-FR/Resources.resw b/WinAppCommon/Strings/fr-FR/Resources.resw
index 79b1546..d3b726d 100644
--- a/WinAppCommon/Strings/fr-FR/Resources.resw
+++ b/WinAppCommon/Strings/fr-FR/Resources.resw
@@ -372,9 +372,6 @@
   <data name="GroupsLeftListView.ButtonLabel" xml:space="preserve">
     <value>Nouveau groupe</value>
   </data>
-  <data name="GroupsLeftListView.HeaderLabel" xml:space="preserve">
-    <value>Groupes</value>
-  </data>
   <data name="HistoryLeftListView.HeaderLabel" xml:space="preserve">
     <value>Historique</value>
   </data>
@@ -453,9 +450,6 @@
   <data name="ToastUpdateDatabase.Title" xml:space="preserve">
     <value>Clé maître</value>
   </data>
-  <data name="EntryTitle.PlaceholderText" xml:space="preserve">
-    <value>Nom de la nouvelle entrée...</value>
-  </data>
   <data name="SearchButtonLabel.Text" xml:space="preserve">
     <value>Recherche</value>
   </data>
@@ -570,4 +564,13 @@
   <data name="PasswordGenerationButton.ButtonContent" xml:space="preserve">
     <value>Aléatoire</value>
   </data>
+  <data name="EntryTitle.Text" xml:space="preserve">
+    <value>Titre</value>
+  </data>
+  <data name="TitleTextBox.ButtonTooltip" xml:space="preserve">
+    <value>Copier le titre</value>
+  </data>
+  <data name="ToastCopyTitle.Message" xml:space="preserve">
+    <value>Titre copié dans le presse-papiers</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WinAppCommon/ViewModels/ViewModelLocatorCommon.cs b/WinAppCommon/ViewModels/ViewModelLocatorCommon.cs
index de13dc2..43b3042 100644
--- a/WinAppCommon/ViewModels/ViewModelLocatorCommon.cs
+++ b/WinAppCommon/ViewModels/ViewModelLocatorCommon.cs
@@ -21,6 +21,7 @@ using MediatR;
 using Microsoft.Extensions.DependencyInjection;
 using ModernKeePass.Application.Common.Interfaces;
 using ModernKeePass.ViewModels.Settings;
+using ModernKeePass.Domain.Interfaces;
 
 namespace ModernKeePass.ViewModels
 {
@@ -45,7 +46,7 @@ namespace ModernKeePass.ViewModels
             else
             {
                 // Create run time view services and models
-                //SimpleIoc.Default.Register<IDataService, DataService>();IDataService
+                SimpleIoc.Default.Register(() => App.Services.GetRequiredService<IDateTime>());
                 SimpleIoc.Default.Register(() => App.Services.GetRequiredService<IMediator>());
                 SimpleIoc.Default.Register(() => App.Services.GetRequiredService<IRecentProxy>());
                 SimpleIoc.Default.Register(() => App.Services.GetRequiredService<IResourceProxy>());