diff --git a/ModernKeePass/Strings/en-US/Resources.resw b/ModernKeePass/Strings/en-US/Resources.resw
index d6adfb4..e33d69a 100644
--- a/ModernKeePass/Strings/en-US/Resources.resw
+++ b/ModernKeePass/Strings/en-US/Resources.resw
@@ -159,6 +159,9 @@
   <data name="AppBarSortGroups.Text" xml:space="preserve">
     <value>Groups</value>
   </data>
+  <data name="CompositeKeyNewButton.ButtonLabel" xml:space="preserve">
+    <value>Create</value>
+  </data>
   <data name="CompositeKeyNewKeyFileTooltip.Content" xml:space="preserve">
     <value>Create new key file</value>
   </data>
diff --git a/ModernKeePass/Strings/fr-FR/Resources.resw b/ModernKeePass/Strings/fr-FR/Resources.resw
index a9cdfbd..f7b9251 100644
--- a/ModernKeePass/Strings/fr-FR/Resources.resw
+++ b/ModernKeePass/Strings/fr-FR/Resources.resw
@@ -159,6 +159,9 @@
   <data name="AppBarSortGroups.Text" xml:space="preserve">
     <value>Groupes</value>
   </data>
+  <data name="CompositeKeyNewButton.ButtonLabel" xml:space="preserve">
+    <value>Créer</value>
+  </data>
   <data name="CompositeKeyNewKeyFileTooltip.Content" xml:space="preserve">
     <value>Créer un nouveau fichier de clé</value>
   </data>
diff --git a/ModernKeePass/Views/GroupDetailPage.xaml b/ModernKeePass/Views/GroupDetailPage.xaml
index 4cb9622..114b6f5 100644
--- a/ModernKeePass/Views/GroupDetailPage.xaml
+++ b/ModernKeePass/Views/GroupDetailPage.xaml
@@ -20,15 +20,6 @@
         <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
         <converters:InverseBooleanToVisibilityConverter x:Key="InverseBooleanToVisibilityConverter"/>
         <converters:NullToBooleanConverter x:Key="NullToBooleanConverter"/>
-        <!--<Style TargetType="controls:TextBoxWithButton" x:Name="FilterBoxStyle">
-            <Setter Property="ButtonSymbol" Value="&#xE16E;" />
-            <Setter Property="Text" Value="{Binding Filter, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-            <Setter Property="FontSize" Value="18" />
-            <Setter Property="VerticalContentAlignment" Value="Center" />
-            <Setter Property="Width" Value="400" />
-            <Setter Property="Style" Value="{StaticResource TextBoxWithButtonStyle}" />
-            <Setter Property="IsButtonEnabled" Value="False" />
-        </Style>-->
     </Page.Resources>
     <Page.DataContext>
         <viewModels:GroupVm />
@@ -189,7 +180,7 @@
                 </ListView.ItemTemplateSelector>
             </ListView>
             <!-- Horizontal scrolling grid -->
-            <HyperlinkButton Grid.Column="1" VerticalAlignment="Top" Margin="40,15,0,0" Click="CreateEntry_ButtonClick" Visibility="{Binding IsSelected, Converter={StaticResource InverseBooleanToVisibilityConverter}}">
+            <HyperlinkButton Grid.Column="1" VerticalAlignment="Top" Margin="40,10,0,0" Click="CreateEntry_ButtonClick" Visibility="{Binding IsSelected, Converter={StaticResource InverseBooleanToVisibilityConverter}}" HorizontalAlignment="Right">
                 <StackPanel Orientation="Horizontal">
                     <SymbolIcon Symbol="Add"></SymbolIcon>
                     <TextBlock x:Uid="GroupCreateEntry" VerticalAlignment="Center" Margin="10,0,0,0" />
diff --git a/ModernKeePass/Views/MainPageFrames/NewDatabasePage.xaml b/ModernKeePass/Views/MainPageFrames/NewDatabasePage.xaml
index df69d38..36454d0 100644
--- a/ModernKeePass/Views/MainPageFrames/NewDatabasePage.xaml
+++ b/ModernKeePass/Views/MainPageFrames/NewDatabasePage.xaml
@@ -24,7 +24,7 @@
         <Border HorizontalAlignment="Left" BorderThickness="1" BorderBrush="AliceBlue" Width="550" Visibility="{Binding ShowPasswordBox, Converter={StaticResource BooleanToVisibilityConverter}}">
             <StackPanel Margin="25,0,25,0">
                 <TextBlock Text="{Binding Name}" />
-                <userControls:CompositeKeyUserControl CreateNew="True" ButtonLabel="Save" >
+                <userControls:CompositeKeyUserControl CreateNew="True" x:Uid="CompositeKeyNewButton">
                     <interactivity:Interaction.Behaviors>
                         <core:EventTriggerBehavior EventName="ValidationChecked">
                             <core:NavigateToPageAction TargetPage="ModernKeePass.Views.GroupDetailPage" />
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/description.txt b/ModernKeePass/appMetadata/en-us/baselisting/description.txt
index f296fb2..ba8816f 100644
--- a/ModernKeePass/appMetadata/en-us/baselisting/description.txt
+++ b/ModernKeePass/appMetadata/en-us/baselisting/description.txt
@@ -1,5 +1,6 @@
+Tired of trying to remember your numerous passwords? Worried that using the same password everywhere is a security risk?
 ModernKeePass is free, open-source and user friendly yet secure password manager, based on proven and certified technology from KeePass 2.x and fully compatible with it.
-You can safely store all your passwords in an encrypted, secure database that you can store anywhere (local, cloud, USB key...)
+You can safely store and generate all your passwords in an encrypted, secure database that you can put anywhere (local computer/tablet, cloud, USB key...)
 
 Even though security is an important matter, this app aims at being simple to use. Suggestions welcome!
 Works in Windows 10, 8.1 and RT.
\ No newline at end of file
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Filter.png b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Filter.png
new file mode 100644
index 0000000..e86498e
Binary files /dev/null and b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Filter.png differ
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Group.png b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Group.png
index a7f5692..1eaaf4b 100644
Binary files a/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Group.png and b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Group.png differ
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/New.png b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/New.png
index d677d4f..eeda597 100644
Binary files a/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/New.png and b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/New.png differ
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Open.png b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Open.png
index 7e40b15..a576a3c 100644
Binary files a/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Open.png and b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Open.png differ
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Recent.png b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Recent.png
index 33e7a1d..bf0a669 100644
Binary files a/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Recent.png and b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Recent.png differ
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Search.png b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Search.png
deleted file mode 100644
index f6c1a76..0000000
Binary files a/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Search.png and /dev/null differ
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Semantic.png b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Semantic.png
index 3b052ce..0cfd92e 100644
Binary files a/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Semantic.png and b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Semantic.png differ
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Settings.png b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Settings.png
index e66a463..1613abf 100644
Binary files a/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Settings.png and b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/Settings.png differ
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/description.Filter.txt b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/description.Filter.txt
new file mode 100644
index 0000000..a1cb4c5
--- /dev/null
+++ b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/description.Filter.txt
@@ -0,0 +1 @@
+Filter your entries to quickly find the one you're looking for
\ No newline at end of file
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/description.Search.txt b/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/description.Search.txt
deleted file mode 100644
index 8627031..0000000
--- a/ModernKeePass/appMetadata/en-us/baselisting/images/Screenshot/description.Search.txt
+++ /dev/null
@@ -1 +0,0 @@
-Search your entries
\ No newline at end of file
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/releaseNotes.txt b/ModernKeePass/appMetadata/en-us/baselisting/releaseNotes.txt
index b1e3e84..9fd78b8 100644
--- a/ModernKeePass/appMetadata/en-us/baselisting/releaseNotes.txt
+++ b/ModernKeePass/appMetadata/en-us/baselisting/releaseNotes.txt
@@ -5,5 +5,7 @@ Change default database creation settings
 Settings is accessible from main menu
 Clear Recent databases
 New French translation
+Better layout whith small screen size
+Search becomes Filter
 Design and usability improvements
 Bugs correction
\ No newline at end of file