diff --git a/PokemonGo-UWP/ViewModels/PokemonInventoryPageViewModel.cs b/PokemonGo-UWP/ViewModels/PokemonInventoryPageViewModel.cs
index 8ff5c0bf8..57fea792d 100644
--- a/PokemonGo-UWP/ViewModels/PokemonInventoryPageViewModel.cs
+++ b/PokemonGo-UWP/ViewModels/PokemonInventoryPageViewModel.cs
@@ -185,7 +185,7 @@ private static IEnumerable<PokemonDataWrapper> GetSortedPokemonCollection(
                 case PokemonSortingModes.Health:
                     return pokemonInventory.OrderByDescending(pokemon => pokemon.Stamina);
                 case PokemonSortingModes.Name:
-                    return pokemonInventory.OrderBy(pokemon => Utils.Resources.Pokemon.GetString(pokemon.PokemonId.ToString()));
+                    return pokemonInventory.OrderBy(pokemon => Utils.Resources.Pokemon.GetString(pokemon.PokemonId.ToString())).ThenByDescending(pokemon => pokemon.Cp);
                 case PokemonSortingModes.Combat:
                     return pokemonInventory.OrderByDescending(pokemon => pokemon.Cp);
                 default:
diff --git a/PokemonGo-UWP/Views/PokemonInventoryPage.xaml b/PokemonGo-UWP/Views/PokemonInventoryPage.xaml
index 6d93aa971..f1fe980ac 100644
--- a/PokemonGo-UWP/Views/PokemonInventoryPage.xaml
+++ b/PokemonGo-UWP/Views/PokemonInventoryPage.xaml
@@ -316,21 +316,23 @@
                     <RelativePanel>
                         <GridView
                             ItemsSource="{Binding PokemonInventory}"
-                            SelectionMode="None">
+                            SelectionMode="None"
+                            RelativePanel.AlignRightWithPanel="True"
+                            RelativePanel.AlignTopWithPanel="True"
+                            RelativePanel.AlignLeftWithPanel="True"
+                            RelativePanel.AlignBottomWithPanel="True">
 
                             <GridView.ItemsPanel>
                                 <ItemsPanelTemplate>
                                     <WrapGrid Orientation="Horizontal"
                                               VerticalChildrenAlignment="Top"
-                                              HorizontalAlignment="Center"
                                               MaximumRowsOrColumns="4" />
                                 </ItemsPanelTemplate>
                             </GridView.ItemsPanel>
 
                             <GridView.ItemTemplate>
                                 <DataTemplate>
-                                    <StackPanel Margin="8,4,8,4"
-                                                Width="92">
+                                    <StackPanel Margin="8,4,8,4">
                                         <TextBlock TextAlignment="Center">
                                             <Run FontSize="12" 
                                                  x:Uid="CpTextBlock" 
@@ -411,7 +413,12 @@
                     <RelativePanel>
                         <GridView
                             ItemsSource="{Binding EggsInventory}"
-                            SelectionMode="None">
+                            SelectionMode="None"
+                            RelativePanel.AlignRightWithPanel="True"
+                            RelativePanel.AlignTopWithPanel="True"
+                            RelativePanel.AlignLeftWithPanel="True"
+                            RelativePanel.AlignBottomWithPanel="True">
+
 
                             <GridView.ItemsPanel>
                                 <ItemsPanelTemplate>