diff --git a/Qwirkle/QwirkleViews/Pages/Gameboard.xaml b/Qwirkle/QwirkleViews/Pages/Gameboard.xaml
index 1413b28..d3627eb 100644
--- a/Qwirkle/QwirkleViews/Pages/Gameboard.xaml
+++ b/Qwirkle/QwirkleViews/Pages/Gameboard.xaml
@@ -74,7 +74,7 @@
             ToolTipProperties.Text="Click here to exit ;)"
             Style="{StaticResource GameButton}" />
 
-        <Label HorizontalOptions="Center" Grid.Row="0" Grid.Column="1" Text="{Binding PlayerList[0].NameTag}"></Label>
+        <Label HorizontalOptions="Center" Grid.Row="0" Grid.Column="1" FontSize="Medium" Text="{Binding PlayerList[0].NameTag}"></Label>
         <CollectionView Grid.Row="0" Grid.Column="1" ItemsSource="{Binding PlayerList[0].Tiles}"
                         HorizontalOptions="Center"
                         VerticalOptions="Center">
@@ -98,7 +98,7 @@
         </CollectionView>
 
 
-        <Label HorizontalOptions="Center" Grid.Row="1" Grid.Column="0" Text="{Binding PlayerList[2].NameTag}"></Label>
+        <Label HorizontalOptions="Center" Grid.Row="1" Grid.Column="0" FontSize="Medium" Text="{Binding PlayerList[2].NameTag}"></Label>
         <CollectionView Grid.Row="1" Grid.Column="0" ItemsSource="{Binding PlayerList[2].Tiles}"
                         HorizontalOptions="Center"
                         VerticalOptions="Center">
@@ -119,7 +119,7 @@
             </CollectionView.ItemTemplate>
         </CollectionView>
 
-        <Label HorizontalOptions="Center" Grid.Row="1" Grid.Column="2" Text="{Binding PlayerList[3].NameTag}"></Label>
+        <Label HorizontalOptions="Center" Grid.Row="1" Grid.Column="2" FontSize="Medium" Text="{Binding PlayerList[3].NameTag}"></Label>
         <CollectionView Grid.Row="1" Grid.Column="2" ItemsSource="{Binding PlayerList[3].Tiles}"
                         HorizontalOptions="Center"
                         VerticalOptions="Center">
@@ -140,7 +140,7 @@
             </CollectionView.ItemTemplate>
         </CollectionView>
 
-        <Label HorizontalOptions="Center" VerticalOptions="End" Grid.Row="2" Grid.Column="1" Text="{Binding PlayerList[1].NameTag}"></Label>
+        <Label HorizontalOptions="Center" VerticalOptions="End" Grid.Row="2" Grid.Column="1" FontSize="Medium" Text="{Binding PlayerList[1].NameTag}"></Label>
         <CollectionView Grid.Row="2" Grid.Column="1" ItemsSource="{Binding PlayerList[1].Tiles}"
                         HorizontalOptions="Center"
                         VerticalOptions="Start">
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 f2f4f2a..3f682eb 100644
--- a/Qwirkle/QwirkleViews/QwirkleViews.csproj
+++ b/Qwirkle/QwirkleViews/QwirkleViews.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
+		<TargetFrameworks>net8.0-windows10.0.19041.0</TargetFrameworks>
 		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
 		<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
 
@@ -61,15 +60,15 @@
 	  <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>
-		<PackageReference Include="CommunityToolkit.Maui" Version="9.0.0" />
+		<PackageReference Include="CommunityToolkit.Maui" Version="9.0.1" />
 		<PackageReference Include="CommunityToolkit.Maui.MediaElement" Version="3.1.1" />
 		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.40" />
 		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.40" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0-preview.4.24266.19" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/Qwirkle/QwirkleViews/Resources/Raw/f1.mp3 b/Qwirkle/QwirkleViews/Resources/Raw/f1.mp3
deleted file mode 100644
index e4e3d9a..0000000
Binary files a/Qwirkle/QwirkleViews/Resources/Raw/f1.mp3 and /dev/null differ