diff --git a/Qwirkle/QwirkleViews/Pages/SetPlayers.xaml.cs b/Qwirkle/QwirkleViews/Pages/SetPlayers.xaml.cs
index b029414..7b0226b 100644
--- a/Qwirkle/QwirkleViews/Pages/SetPlayers.xaml.cs
+++ b/Qwirkle/QwirkleViews/Pages/SetPlayers.xaml.cs
@@ -54,7 +54,7 @@ public partial class SetPlayers : ContentPage
             game.GiveTilesToPlayers();
             game.SetNextPlayer();
             Shell.Current.GoToAsync("Gameboard");
-            //Navigation.PushAsync(new Gameboard());
+
 
         }
 
diff --git a/Qwirkle/QwirkleViews/PopUpEndGame.xaml.cs b/Qwirkle/QwirkleViews/PopUpEndGame.xaml.cs
index fe153d9..34288e2 100644
--- a/Qwirkle/QwirkleViews/PopUpEndGame.xaml.cs
+++ b/Qwirkle/QwirkleViews/PopUpEndGame.xaml.cs
@@ -1,4 +1,5 @@
 using CommunityToolkit.Maui.Views;
+using Microsoft.Maui.Controls;
 using QwirkleClassLibrary.Games;
 using System.Collections.ObjectModel;
 
@@ -32,7 +33,8 @@ public partial class PopUpEndGame : Popup
 
     public async void OnButtonNextClick(object sender, EventArgs e)
     {
-        await CloseAsync();
+        Close();
+        await Shell.Current.GoToAsync("MainPage");
     }
 
 }
diff --git a/Qwirkle/QwirkleViews/QwirkleViews.csproj b/Qwirkle/QwirkleViews/QwirkleViews.csproj
index 5c997e5..3f682eb 100644
--- a/Qwirkle/QwirkleViews/QwirkleViews.csproj
+++ b/Qwirkle/QwirkleViews/QwirkleViews.csproj
@@ -60,7 +60,7 @@
 	  <None Remove="Resources\Fonts\DiloWorld.ttf" />
 	  <None Remove="Resources\Fonts\Lexend-Medium.ttf" />
 	  <None Remove="Resources\Images\qwirklelogo.png" />
-	  <None Remove="Resources\Images\uca.png" />
+	  <None Remove="Resources\Images\uca.png" />     
 	</ItemGroup>
 
 	<ItemGroup>