diff --git a/ModernKeePass/Views/GroupDetailPage.xaml b/ModernKeePass/Views/GroupDetailPage.xaml
index 71b32e0..0862383 100644
--- a/ModernKeePass/Views/GroupDetailPage.xaml
+++ b/ModernKeePass/Views/GroupDetailPage.xaml
@@ -199,7 +199,7 @@
                     <TextBlock x:Uid="GroupCreateEntry" VerticalAlignment="Center" Margin="10,0,0,0" />
                 </StackPanel>
             </HyperlinkButton>
-            <SemanticZoom Grid.Column="1" ViewChangeStarted="SemanticZoom_ViewChangeStarted" Margin="20,60,0,0">
+            <SemanticZoom Grid.Column="1" ViewChangeStarted="SemanticZoom_ViewChangeStarted" Margin="20,60,0,0" ScrollViewer.HorizontalScrollBarVisibility="Visible">
                 <SemanticZoom.ZoomedInView>
                     <!-- Horizontal scrolling grid -->
                     <GridView
@@ -315,36 +315,30 @@
                     </GridView>
                 </SemanticZoom.ZoomedInView>
                 <SemanticZoom.ZoomedOutView>
-                    <ListView
-                        Height="Auto" Width="Auto"
+                    <GridView
                         ItemsSource="{Binding Source={StaticResource EntriesZoomedOutViewSource}}"
                         SelectionChanged="groups_SelectionChanged"
                         SelectionMode="None"
                         IsSynchronizedWithCurrentItem="False">
-                        <ListView.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <VirtualizingStackPanel Orientation="Horizontal" />
-                            </ItemsPanelTemplate>
-                        </ListView.ItemsPanel>
-                        <ListView.ItemTemplate>
+                        <GridView.ItemTemplate>
                             <DataTemplate>
                                 <StackPanel Orientation="Vertical">
-                                    <TextBlock Text="{Binding Name}" Style="{StaticResource TitleTextBlockStyle}" TextWrapping="NoWrap"/>
+                                    <TextBlock Width="100" Text="{Binding Name}" Style="{StaticResource TitleTextBlockStyle}" TextWrapping="NoWrap"/>
                                 </StackPanel>
                             </DataTemplate>
-                        </ListView.ItemTemplate>
-                        <ListView.GroupStyle>
+                        </GridView.ItemTemplate>
+                        <GridView.GroupStyle>
                             <GroupStyle HidesIfEmpty="True">
                                 <GroupStyle.HeaderTemplate>
                                     <DataTemplate>
-                                        <Grid Background="LightGray" Margin="0,0,10,0" HorizontalAlignment="Left">
-                                            <TextBlock Text="{Binding Key}" Width="40" Foreground="Black" Margin="30" Style="{StaticResource HeaderTextBlockStyle}"/>
+                                        <Grid Background="LightGray" HorizontalAlignment="Left">
+                                            <TextBlock Text="{Binding Key}" Width="40" Margin="30" Foreground="Black" Style="{StaticResource HeaderTextBlockStyle}" TextAlignment="Center" />
                                         </Grid>
                                     </DataTemplate>
                                 </GroupStyle.HeaderTemplate>
                             </GroupStyle>
-                        </ListView.GroupStyle>
-                    </ListView>
+                        </GridView.GroupStyle>
+                    </GridView>
                 </SemanticZoom.ZoomedOutView>
             </SemanticZoom>
         </Grid>
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/releaseNotes.txt b/ModernKeePass/appMetadata/en-us/baselisting/releaseNotes.txt
index 9ef8331..37b6e66 100644
--- a/ModernKeePass/appMetadata/en-us/baselisting/releaseNotes.txt
+++ b/ModernKeePass/appMetadata/en-us/baselisting/releaseNotes.txt
@@ -1,4 +1,2 @@
-Application now correctly resumes from suspend
-Code enhancements
-Return of the Donate page, with Paypal
-KeePassLib version bump to 2.38
\ No newline at end of file
+Design improvements
+KeePassLib version bump to 2.39.1
\ No newline at end of file
diff --git a/ModernKeePass/appMetadata/fr-fr/baselisting/releaseNotes.txt b/ModernKeePass/appMetadata/fr-fr/baselisting/releaseNotes.txt
index 4a76727..55d4ef2 100644
--- a/ModernKeePass/appMetadata/fr-fr/baselisting/releaseNotes.txt
+++ b/ModernKeePass/appMetadata/fr-fr/baselisting/releaseNotes.txt
@@ -1,4 +1,2 @@
-L'application recupere correctement d'une suspension
-Ameliorations de code
-Retour de la page de donation, avec Paypal
-Version de la KeePassLib montee a 2.38
\ No newline at end of file
+Ameliorations de design
+Version de la KeePassLib passe a 2.39.1
\ No newline at end of file
diff --git a/ModernKeePassLib/Utility/UrlUtil.cs b/ModernKeePassLib/Utility/UrlUtil.cs
index 06bbb9a..adeef2e 100644
--- a/ModernKeePassLib/Utility/UrlUtil.cs
+++ b/ModernKeePassLib/Utility/UrlUtil.cs
@@ -327,10 +327,10 @@ namespace ModernKeePassLib.Utility
 					return strTargetFile;
 			}
 
-#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT)
+#if (!KeePassLibSD && !KeePassUAP && !ModernKeePassLib)
 			if(NativeLib.IsUnix())
-#endif
 			{
+#endif
 				bool bBaseUnc = IsUncPath(strBaseFile);
 				bool bTargetUnc = IsUncPath(strTargetFile);
 				if((!bBaseUnc && bTargetUnc) || (bBaseUnc && !bTargetUnc))
@@ -358,9 +358,9 @@ namespace ModernKeePassLib.Utility
 				}
 
 				return sbRel.ToString();
+#if (!KeePassLibSD && !KeePassUAP && !ModernKeePassLib)
 			}
 
-#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT)
 			try // Windows
 			{
 				const int nMaxPath = NativeMethods.MAX_PATH * 2;
@@ -453,16 +453,10 @@ namespace ModernKeePassLib.Utility
 			string str;
 			try
 			{
-#if KeePassRT
-				var dirT = Windows.Storage.StorageFolder.GetFolderFromPathAsync(
-					strPath).AwaitEx();
-				str = dirT.Path;
-#elif ModernKeePassLib
+#if ModernKeePassLib
                 var dirT = StorageFolder.GetFolderFromPathAsync(
                     strPath).GetResults();
                 str = dirT.Path;
-                /*var dirT = FileSystem.Current.GetFolderFromPathAsync(strPath).Result;
-				str = dirT.Path;*/
 #else
 				str = Path.GetFullPath(strPath);
 #endif
@@ -640,8 +634,8 @@ namespace ModernKeePassLib.Utility
 			string strDir;
 			if(NativeLib.IsUnix())
 				strDir = NativeMethods.GetUserRuntimeDir();
-#if ModernKeePassLib
-			else strDir = ApplicationData.Current.TemporaryFolder.Path;
+#if KeePassUAP || ModernKeePassLib
+			else strDir = Windows.Storage.ApplicationData.Current.TemporaryFolder.Path;
 #else
 			else strDir = Path.GetTempPath();