diff --git a/ModernKeePass/Pages/EntryDetailPage.xaml b/ModernKeePass/Pages/EntryDetailPage.xaml
index d930cb9..54c390c 100644
--- a/ModernKeePass/Pages/EntryDetailPage.xaml
+++ b/ModernKeePass/Pages/EntryDetailPage.xaml
@@ -38,13 +38,18 @@
                 </Style>
             </StackPanel.Resources>
             <TextBlock x:Name="userTextBlock"  TextWrapping="Wrap" Text="User name or login" FontSize="18"/>
-            <TextBox x:Name="userTextBox" HorizontalAlignment="Left" TextWrapping="Wrap" Text="{Binding UserName, Mode=TwoWay}" Width="350" />
+            <TextBox x:Name="userTextBox" HorizontalAlignment="Left" TextWrapping="Wrap" Text="{Binding UserName, Mode=TwoWay}" Width="350"  Height="32" />
             <TextBlock x:Name="passwordTextBlock" TextWrapping="Wrap" Text="Password"  FontSize="18"/>
-            <PasswordBox x:Name="passwordBox" HorizontalAlignment="Left" Password="{Binding Password, Mode=TwoWay}" Width="350" IsPasswordRevealButtonEnabled="True" Visibility="{Binding IsRevealPassword, Converter={StaticResource InverseBooleanToVisibilityConverter}}" />
-            <TextBox x:Name="passwordTextBox" HorizontalAlignment="Left" TextWrapping="Wrap" Text="{Binding Password, Mode=TwoWay}" Width="350" Visibility="{Binding IsRevealPassword, Converter={StaticResource BooleanToVisibilityConverter}}" />
+            <PasswordBox x:Name="passwordBox" HorizontalAlignment="Left" Password="{Binding Password, Mode=TwoWay}" Width="350"  Height="32" IsPasswordRevealButtonEnabled="True" Visibility="{Binding IsRevealPassword, Converter={StaticResource InverseBooleanToVisibilityConverter}}" />
+            <TextBox x:Name="passwordTextBox" HorizontalAlignment="Left" TextWrapping="Wrap" Text="{Binding Password, Mode=TwoWay}" Width="350" Height="32" Visibility="{Binding IsRevealPassword, Converter={StaticResource BooleanToVisibilityConverter}}" />
             <CheckBox x:Name="checkBox" HorizontalAlignment="Left" Margin="-3,0,0,0" Content="Show password" IsChecked="{Binding IsRevealPassword, Mode=TwoWay}"/>
             <TextBlock x:Name="urlTextBlock" TextWrapping="Wrap" Text="URL" FontSize="18"/>
-            <TextBox x:Name="urlTextBox" HorizontalAlignment="Left" TextWrapping="Wrap" Text="{Binding Url, Mode=TwoWay}" Width="350" MaxLength="256" />
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Width="350" >
+                <TextBox x:Name="urlTextBox" TextWrapping="Wrap" Text="{Binding Url, Mode=TwoWay}" Height="32" Width="300" MaxLength="256" />
+                <Button Click="UrlButton_Click" Height="32" BorderThickness="0" Background="Transparent" Margin="0">
+                    <SymbolIcon Symbol="Forward" VerticalAlignment="Center" />
+                </Button>
+            </StackPanel>
             <TextBlock x:Name="notesTextBlock" TextWrapping="Wrap" Text="Notes" FontSize="18"/>
             <TextBox x:Name="notesTextBox" HorizontalAlignment="Left" TextWrapping="Wrap" Text="{Binding Notes, Mode=TwoWay}" Width="350" Height="200" AcceptsReturn="True" IsSpellCheckEnabled="True" />
         </StackPanel>
diff --git a/ModernKeePass/Pages/EntryDetailPage.xaml.cs b/ModernKeePass/Pages/EntryDetailPage.xaml.cs
index 603c357..d17f8a1 100644
--- a/ModernKeePass/Pages/EntryDetailPage.xaml.cs
+++ b/ModernKeePass/Pages/EntryDetailPage.xaml.cs
@@ -76,5 +76,18 @@ namespace ModernKeePass.Pages
             entry?.RemoveEntry();
             if (Frame.CanGoBack) Frame.GoBack();
         }
+
+        private async void UrlButton_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                var uri = new Uri(urlTextBox.Text);
+                await Windows.System.Launcher.LaunchUriAsync(uri);
+            }
+            catch
+            {
+                // TODO: Show some error
+            }
+        }
     }
 }
diff --git a/ModernKeePass/Pages/GroupDetailPage.xaml b/ModernKeePass/Pages/GroupDetailPage.xaml
index b024d49..42e6365 100644
--- a/ModernKeePass/Pages/GroupDetailPage.xaml
+++ b/ModernKeePass/Pages/GroupDetailPage.xaml
@@ -27,7 +27,10 @@
                 Source="{Binding Groups}"/>
             <CollectionViewSource
                 x:Name="EntriesViewSource"
-                Source="{Binding Entries}"/>
+                Source="{Binding Entries}" />
+            <CollectionViewSource
+                x:Name="EntriesZoomedOutViewSource"
+                Source="{Binding EntriesZoomedOut}" IsSourceGrouped="True"/>
         </Grid.Resources>
         <Grid.ChildrenTransitions>
             <TransitionCollection>
@@ -170,15 +173,33 @@
             <SemanticZoom.ZoomedOutView>
                 <ListView
                     x:Name="SemanticListView"
-                    ItemsSource="{Binding Source={StaticResource EntriesViewSource}}"
+                    ItemsSource="{Binding Source={StaticResource EntriesZoomedOutViewSource}}"
                     IsSwipeEnabled="false" 
                     SelectionChanged="groups_SelectionChanged"
-                    IsSynchronizedWithCurrentItem="False" >
+                    IsSynchronizedWithCurrentItem="False">
+                    <ListView.ItemsPanel>
+                        <ItemsPanelTemplate>
+                            <StackPanel Orientation="Horizontal" />
+                        </ItemsPanelTemplate>
+                    </ListView.ItemsPanel>
                     <ListView.ItemTemplate>
                         <DataTemplate>
-                            <TextBlock Text="{Binding Title}" Style="{StaticResource TitleTextBlockStyle}" TextWrapping="NoWrap"/>
+                            <StackPanel Orientation="Vertical">
+                                <TextBlock Text="{Binding Title}" Style="{StaticResource TitleTextBlockStyle}" TextWrapping="NoWrap"/>
+                            </StackPanel>
                         </DataTemplate>
                     </ListView.ItemTemplate>
+                    <ListView.GroupStyle>
+                        <GroupStyle HidesIfEmpty="True">
+                            <GroupStyle.HeaderTemplate>
+                                <DataTemplate>
+                                    <Grid Background="LightGray" Margin="0">
+                                        <TextBlock Text="{Binding Key}" Foreground="Black" Margin="30" Style="{StaticResource HeaderTextBlockStyle}"/>
+                                    </Grid>
+                                </DataTemplate>
+                            </GroupStyle.HeaderTemplate>
+                        </GroupStyle>
+                    </ListView.GroupStyle>
                 </ListView>
             </SemanticZoom.ZoomedOutView>
         </SemanticZoom>
diff --git a/ModernKeePass/Pages/RecentDatabasesPage.xaml.cs b/ModernKeePass/Pages/RecentDatabasesPage.xaml.cs
index 1aeeeba..e293fa5 100644
--- a/ModernKeePass/Pages/RecentDatabasesPage.xaml.cs
+++ b/ModernKeePass/Pages/RecentDatabasesPage.xaml.cs
@@ -43,6 +43,7 @@ namespace ModernKeePass.Pages
             var mru = StorageApplicationPermissions.MostRecentlyUsedList;
             var file = await mru.GetFileAsync(recentVm.SelectedItem.Token);
 
+            // TODO: this closes the current opened database
             var app = (App)Application.Current;
             app.Database = new DatabaseHelper(file);
         }
diff --git a/ModernKeePass/ViewModels/GroupVm.cs b/ModernKeePass/ViewModels/GroupVm.cs
index 4da682b..27a888b 100644
--- a/ModernKeePass/ViewModels/GroupVm.cs
+++ b/ModernKeePass/ViewModels/GroupVm.cs
@@ -12,18 +12,32 @@ namespace ModernKeePass.ViewModels
     {
         public GroupVm ParentGroup { get; }
         public ObservableCollection<EntryVm> Entries { get; set; } = new ObservableCollection<EntryVm>();
+        
         public ObservableCollection<GroupVm> Groups { get; set; } = new ObservableCollection<GroupVm>();
 
-        public int EntryCount => Entries.Count - 1;
+        public int EntryCount => Entries.Count() - 1;
         public int GroupCount => Groups.Count - 1;
         public bool IsNotRoot => ParentGroup != null;
         public FontWeight FontWeight => _pwGroup == null ? FontWeights.Bold : FontWeights.Normal;
-        
+
+        public IOrderedEnumerable<IGrouping<char, EntryVm>> EntriesZoomedOut
+        {
+            get
+            {
+                return from e in Entries
+                       where e.Entry != null
+                       group e by e.Title.FirstOrDefault() into grp
+                       orderby grp.Key
+                       select grp;
+            }
+        }
+
         public string Name
         {
             get { return _pwGroup == null ? "New group" : _pwGroup.Name; }
             set { _pwGroup.Name = value; }
         }
+
         public Symbol IconSymbol
         {
             get
@@ -56,11 +70,9 @@ namespace ModernKeePass.ViewModels
         {
             _pwGroup = pwGroup;
             ParentGroup = parent;
-            Entries = new ObservableCollection<EntryVm>(pwGroup.Entries.Select(e => new EntryVm(e, this)));
+            Entries = new ObservableCollection<EntryVm>(pwGroup.Entries.Select(e => new EntryVm(e, this)).OrderBy(e => e.Title));
             Entries.Insert(0, new EntryVm ());
-            //Entries.Add(new EntryVm { Title = " New entry" });
-            Groups = new ObservableCollection<GroupVm>(pwGroup.Groups.Select(g => new GroupVm(g, this)));
-            //Groups.Insert(0, new GroupVm { Name = " + New group" });
+            Groups = new ObservableCollection<GroupVm>(pwGroup.Groups.Select(g => new GroupVm(g, this)).OrderBy(g => g.Name));
             Groups.Insert(0, new GroupVm ());
         }