diff --git a/Qwirkle/Qwirkle/AppShell.xaml b/Qwirkle/Qwirkle/AppShell.xaml
index 90ee21e..d5e093b 100644
--- a/Qwirkle/Qwirkle/AppShell.xaml
+++ b/Qwirkle/Qwirkle/AppShell.xaml
@@ -5,32 +5,31 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:local="clr-namespace:Qwirkle"
     xmlns:localPages="clr-namespace:Qwirkle.Pages"
-    Shell.FlyoutBehavior="Disabled"
+    Shell.FlyoutBehavior="Flyout"
     Title="Qwirkle">
-    <TabBar>
-        <ShellContent
-            Title="Home"
-            ContentTemplate="{DataTemplate local:MainPage}"
-            Route="MainPage" />
-        <ShellContent
-            Title="SetPlayers"
-            ContentTemplate="{DataTemplate localPages:SetPlayers}"
-            Route="SetPlayers" />
-        <ShellContent
-            Title="Gameboard"
-            ContentTemplate="{DataTemplate localPages:Gameboard}"
-            Route="Gameboard" />
-        <ShellContent
-            Title="Leaderboard"
-            ContentTemplate="{DataTemplate localPages:Leaderboard}"
-            Route="Leaderboard" />
-        <ShellContent
-            Title="Scoreboard"
-            ContentTemplate="{DataTemplate localPages:Scoreboard}"
-            Route="Scoreboard" />
-        <ShellContent
-            Title="Settings"
-            ContentTemplate="{DataTemplate localPages:Settings}"
-            Route="Settings" />
-    </TabBar>
+    
+    <ShellContent
+        ContentTemplate="{DataTemplate local:MainPage}"
+        Route="MainPage" />
+    <ShellContent
+        Title="SetPlayers"
+        ContentTemplate="{DataTemplate localPages:SetPlayers}"
+        Route="SetPlayers" />
+    <ShellContent
+        Title="Gameboard"
+        ContentTemplate="{DataTemplate localPages:Gameboard}"
+        Route="Gameboard" />
+    <ShellContent
+        Title="Leaderboard"
+        ContentTemplate="{DataTemplate localPages:Leaderboard}"
+        Route="Leaderboard" />
+    <ShellContent
+        Title="Scoreboard"
+        ContentTemplate="{DataTemplate localPages:Scoreboard}"
+        Route="Scoreboard" />
+    <ShellContent
+        Title="Settings"
+        ContentTemplate="{DataTemplate localPages:Settings}"
+        Route="Settings" />
+
 </Shell>
diff --git a/Qwirkle/Qwirkle/MainPage.xaml b/Qwirkle/Qwirkle/MainPage.xaml
index de688ba..83bd79f 100644
--- a/Qwirkle/Qwirkle/MainPage.xaml
+++ b/Qwirkle/Qwirkle/MainPage.xaml
@@ -10,45 +10,82 @@
 
             <Label
                 Text="QWIRKLE"
-                FontSize="Header"
+                FontSize="100"
+                FontFamily="DiloWorld"
                 HorizontalTextAlignment="Center"
                 />
 
             <Image
-                Source="qwirklelogo.jpeg"
-                HeightRequest="185"
+                Source="qwirklelogo.png"
+                HeightRequest="300"
                 Aspect="AspectFit"
                 />
-
-            <Button
+            
+            <Border Stroke="Transparent">
+                <Button
+                WidthRequest="200"
                 Text="Play"
                 HorizontalOptions="Center"
                 />
+                <Border.Shadow>
+                    <Shadow></Shadow>
+                </Border.Shadow>
+            </Border>
 
-            <Button
+            <Border Stroke="Transparent">
+                <Button
+                WidthRequest="200"
                 Text="Continue"
                 HorizontalOptions="Center"
                 />
+                <Border.Shadow>
+                    <Shadow></Shadow>
+                </Border.Shadow>
+            </Border>
 
-            <Button
+            <Border Stroke="Transparent">
+                <Button
+                WidthRequest="200"
                 Text="Leaderboard"
                 HorizontalOptions="Center"
                 />
+                <Border.Shadow>
+                    <Shadow></Shadow>
+                </Border.Shadow>
+            </Border>
 
-            <Button
+            <Border Stroke="Transparent">
+                <Button
+                WidthRequest="200"
                 Text="Rules"
                 HorizontalOptions="Center"
                 />
+                <Border.Shadow>
+                    <Shadow></Shadow>
+                </Border.Shadow>
+            </Border>
 
-            <Button
+            <Border Stroke="Transparent">
+                <Button
+                WidthRequest="200"
                 Text="Settings"
                 HorizontalOptions="Center"
                 />
+                <Border.Shadow>
+                    <Shadow></Shadow>
+                </Border.Shadow>
+            </Border>
 
-            <Button
+            <Border Stroke="Transparent">
+                <Button
+                WidthRequest="200"
                 Text="Credits"
                 HorizontalOptions="Center"
                 />
+                <Border.Shadow>
+                    <Shadow></Shadow>
+                </Border.Shadow>
+            </Border>
 
         </VerticalStackLayout>
 
diff --git a/Qwirkle/Qwirkle/MauiProgram.cs b/Qwirkle/Qwirkle/MauiProgram.cs
index bea50df..992f00b 100644
--- a/Qwirkle/Qwirkle/MauiProgram.cs
+++ b/Qwirkle/Qwirkle/MauiProgram.cs
@@ -11,8 +11,10 @@ namespace Qwirkle
                 .UseMauiApp<App>()
                 .ConfigureFonts(fonts =>
                 {
-                    fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
-                    fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
+                    //fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
+                    //fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
+                    fonts.AddFont("DiloWorld.ttf", "DiloWorld");
+                    fonts.AddFont("Lexend-Medium.ttf", "Lexend-Meduim");
                 });
 
 #if DEBUG
diff --git a/Qwirkle/Qwirkle/Pages/SetPlayers.xaml b/Qwirkle/Qwirkle/Pages/SetPlayers.xaml
index 9378e24..2101f69 100644
--- a/Qwirkle/Qwirkle/Pages/SetPlayers.xaml
+++ b/Qwirkle/Qwirkle/Pages/SetPlayers.xaml
@@ -3,48 +3,50 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Qwirkle.Pages.SetPlayers"
              Title="SetPlayers">
-    <VerticalStackLayout>
-
-        <Label
-            Text="SetPlayers"
-            FontSize="51"
-            VerticalOptions="Center" 
-            HorizontalOptions="Center" />
+    <ScrollView>
+        <VerticalStackLayout>
+
+            <Label
+                Text="SetPlayers"
+                FontSize="51"
+                VerticalOptions="Center" 
+                HorizontalOptions="Center" />
         
-        <Label
-                Text="Players 1"
-                FontSize="20"
-                HorizontalOptions="Start" />
+            <Label
+                    Text="Players 1"
+                    FontSize="20"
+                    HorizontalOptions="Start" />
 
-        <Entry Text="Entry tag of player1" HorizontalOptions="Start" MinimumWidthRequest="200" Margin="10"/>
+            <Entry Text="Entry tag of player1" TextColor="Gray" HorizontalOptions="Start" MinimumWidthRequest="200" Margin="10"/>
 
-        <Label
-                Text="Players 2"
-                FontSize="20"
-                HorizontalOptions="Start" />
+            <Label
+                    Text="Players 2"
+                    FontSize="20"
+                    HorizontalOptions="Start" />
 
-        <Entry Text="Entry tag of player2" HorizontalOptions="Start" MinimumWidthRequest="200" Margin="10"/>
+            <Entry Text="Entry tag of player2" TextColor="Gray" HorizontalOptions="Start" MinimumWidthRequest="200" Margin="10"/>
 
-        <Label
-                Text="Players 3"
-                FontSize="20"
-                HorizontalOptions="Start" />
+            <Label
+                    Text="Players 3"
+                    FontSize="20"
+                    HorizontalOptions="Start" />
 
-        <Entry Text="Entry tag of player3" HorizontalOptions="Start" MinimumWidthRequest="200" Margin="10"/>
+            <Entry Text="Entry tag of player3" TextColor="Gray"  HorizontalOptions="Start" MinimumWidthRequest="200" Margin="10"/>
 
-        <Label
-                Text="Players 4"
-                FontSize="20"
-                HorizontalOptions="Start" />
+            <Label
+                    Text="Players 4"
+                    FontSize="20"
+                    HorizontalOptions="Start" />
 
-        <Entry Text="Entry tag of player4" HorizontalOptions="Start" MinimumWidthRequest="200" Margin="10"/>
+            <Entry Text="Entry tag of player4" TextColor="Gray" HorizontalOptions="Start" MinimumWidthRequest="200" Margin="10"/>
 
 
-        <Button Text="Confirm"
-                Margin="200"
-                HorizontalOptions="Center"
-                VerticalOptions="End"
-         />
+            <Button Text="Confirm"
+                    Margin="200"
+                    HorizontalOptions="Center"
+                    VerticalOptions="End"
+             />
 
-    </VerticalStackLayout>
+        </VerticalStackLayout>
+    </ScrollView>
 </ContentPage>
\ No newline at end of file
diff --git a/Qwirkle/Qwirkle/Qwirkle.csproj b/Qwirkle/Qwirkle/Qwirkle.csproj
index 56af11f..e9c4f61 100644
--- a/Qwirkle/Qwirkle/Qwirkle.csproj
+++ b/Qwirkle/Qwirkle/Qwirkle.csproj
@@ -56,6 +56,12 @@
 		<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <None Remove="Resources\Fonts\DiloWorld.ttf" />
+	  <None Remove="Resources\Fonts\Lexend-Medium.ttf" />
+	  <None Remove="Resources\Images\qwirklelogo.png" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
 		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
diff --git a/Qwirkle/Qwirkle/Resources/Fonts/DiloWorld.ttf b/Qwirkle/Qwirkle/Resources/Fonts/DiloWorld.ttf
new file mode 100644
index 0000000..939af50
Binary files /dev/null and b/Qwirkle/Qwirkle/Resources/Fonts/DiloWorld.ttf differ
diff --git a/Qwirkle/Qwirkle/Resources/Fonts/Lexend-Medium.ttf b/Qwirkle/Qwirkle/Resources/Fonts/Lexend-Medium.ttf
new file mode 100644
index 0000000..d91a867
Binary files /dev/null and b/Qwirkle/Qwirkle/Resources/Fonts/Lexend-Medium.ttf differ
diff --git a/Qwirkle/Qwirkle/Resources/Fonts/OpenSans-Regular.ttf b/Qwirkle/Qwirkle/Resources/Fonts/OpenSans-Regular.ttf
deleted file mode 100644
index 9ab655d..0000000
Binary files a/Qwirkle/Qwirkle/Resources/Fonts/OpenSans-Regular.ttf and /dev/null differ
diff --git a/Qwirkle/Qwirkle/Resources/Fonts/OpenSans-Semibold.ttf b/Qwirkle/Qwirkle/Resources/Fonts/OpenSans-Semibold.ttf
deleted file mode 100644
index 2b7468e..0000000
Binary files a/Qwirkle/Qwirkle/Resources/Fonts/OpenSans-Semibold.ttf and /dev/null differ
diff --git a/Qwirkle/Qwirkle/Resources/Images/dotnet_bot.png b/Qwirkle/Qwirkle/Resources/Images/dotnet_bot.png
deleted file mode 100644
index 91dc407..0000000
Binary files a/Qwirkle/Qwirkle/Resources/Images/dotnet_bot.png and /dev/null differ
diff --git a/Qwirkle/Qwirkle/Resources/Images/qwirklelogo.jpeg b/Qwirkle/Qwirkle/Resources/Images/qwirklelogo.jpeg
deleted file mode 100644
index 6450744..0000000
Binary files a/Qwirkle/Qwirkle/Resources/Images/qwirklelogo.jpeg and /dev/null differ
diff --git a/Qwirkle/Qwirkle/Resources/Images/qwirklelogo.png b/Qwirkle/Qwirkle/Resources/Images/qwirklelogo.png
new file mode 100644
index 0000000..17557d5
Binary files /dev/null and b/Qwirkle/Qwirkle/Resources/Images/qwirklelogo.png differ
diff --git a/Qwirkle/Qwirkle/Resources/Styles/Styles.xaml b/Qwirkle/Qwirkle/Resources/Styles/Styles.xaml
index b459e3c..daca5c2 100644
--- a/Qwirkle/Qwirkle/Resources/Styles/Styles.xaml
+++ b/Qwirkle/Qwirkle/Resources/Styles/Styles.xaml
@@ -26,8 +26,8 @@
     <Style TargetType="Button">
         <Setter Property="TextColor" Value="Black" />
         <Setter Property="BackgroundColor" Value="White" />
-        <Setter Property="FontFamily" Value="OpenSansRegular"/>
-        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="FontFamily" Value="Lexend-Medium"/>
+        <Setter Property="FontSize" Value="25"/>
         <Setter Property="BorderWidth" Value="0"/>
         <Setter Property="CornerRadius" Value="8"/>
         <Setter Property="Padding" Value="14,10"/>
@@ -35,15 +35,19 @@
         <Setter Property="MinimumWidthRequest" Value="44"/>
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
-                <VisualStateGroup x:Name="CommonStates">
-                    <VisualState x:Name="Normal" />
-                    <VisualState x:Name="Disabled">
+                <VisualStateGroup>
+                    <VisualState x:Name="Normal">
                         <VisualState.Setters>
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray200}}" />
-                            <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray600}}" />
+                            <Setter Property="Scale"
+                    Value="1" />
+                        </VisualState.Setters>
+                    </VisualState>
+                    <VisualState x:Name="PointerOver">
+                        <VisualState.Setters>
+                            <Setter Property="Scale"
+                    Value="1.05" />
                         </VisualState.Setters>
                     </VisualState>
-                    <VisualState x:Name="PointerOver" />
                 </VisualStateGroup>
             </VisualStateGroupList>
         </Setter>
@@ -70,7 +74,7 @@
     <Style TargetType="DatePicker">
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
         <Setter Property="BackgroundColor" Value="Transparent" />
-        <Setter Property="FontFamily" Value="OpenSansRegular"/>
+        <Setter Property="FontFamily" Value="Lexend-Meduim"/>
         <Setter Property="FontSize" Value="14"/>
         <Setter Property="MinimumHeightRequest" Value="44"/>
         <Setter Property="MinimumWidthRequest" Value="44"/>
@@ -91,7 +95,7 @@
     <Style TargetType="Editor">
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
         <Setter Property="BackgroundColor" Value="Transparent" />
-        <Setter Property="FontFamily" Value="OpenSansRegular"/>
+        <Setter Property="FontFamily" Value="Lexend-Meduim"/>
         <Setter Property="FontSize" Value="14" />
         <Setter Property="PlaceholderColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" />
         <Setter Property="MinimumHeightRequest" Value="44"/>
@@ -113,7 +117,7 @@
     <Style TargetType="Entry">
         <Setter Property="TextColor" Value="Black" />
         <Setter Property="BackgroundColor" Value="White" />
-        <Setter Property="FontFamily" Value="OpenSansRegular"/>
+        <Setter Property="FontFamily" Value="Lexend-Meduim"/>
         <Setter Property="FontSize" Value="14" />
         <Setter Property="PlaceholderColor" Value="Red" />
         <Setter Property="MinimumHeightRequest" Value="44"/>
@@ -163,7 +167,7 @@
     <Style TargetType="Label">
         <Setter Property="TextColor" Value="DarkSlateGrey" />
         <Setter Property="BackgroundColor" Value="Transparent" />
-        <Setter Property="FontFamily" Value="OpenSansRegular" />
+        <Setter Property="FontFamily" Value="Lexend-Meduim" />
         <Setter Property="FontSize" Value="14" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
@@ -206,7 +210,7 @@
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
         <Setter Property="TitleColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" />
         <Setter Property="BackgroundColor" Value="Transparent" />
-        <Setter Property="FontFamily" Value="OpenSansRegular"/>
+        <Setter Property="FontFamily" Value="Lexend-Meduim"/>
         <Setter Property="FontSize" Value="14"/>
         <Setter Property="MinimumHeightRequest" Value="44"/>
         <Setter Property="MinimumWidthRequest" Value="44"/>
@@ -244,7 +248,7 @@
     <Style TargetType="RadioButton">
         <Setter Property="BackgroundColor" Value="Transparent"/>
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
-        <Setter Property="FontFamily" Value="OpenSansRegular"/>
+        <Setter Property="FontFamily" Value="Lexend-Meduim"/>
         <Setter Property="FontSize" Value="14"/>
         <Setter Property="MinimumHeightRequest" Value="44"/>
         <Setter Property="MinimumWidthRequest" Value="44"/>
@@ -271,7 +275,7 @@
         <Setter Property="PlaceholderColor" Value="{StaticResource Gray500}" />
         <Setter Property="CancelButtonColor" Value="{StaticResource Gray500}" />
         <Setter Property="BackgroundColor" Value="Transparent" />
-        <Setter Property="FontFamily" Value="OpenSansRegular" />
+        <Setter Property="FontFamily" Value="Lexend-Meduim" />
         <Setter Property="FontSize" Value="14" />
         <Setter Property="MinimumHeightRequest" Value="44"/>
         <Setter Property="MinimumWidthRequest" Value="44"/>
@@ -294,7 +298,7 @@
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
         <Setter Property="PlaceholderColor" Value="{StaticResource Gray500}" />
         <Setter Property="BackgroundColor" Value="Transparent" />
-        <Setter Property="FontFamily" Value="OpenSansRegular" />
+        <Setter Property="FontFamily" Value="Lexend-Meduim" />
         <Setter Property="FontSize" Value="14" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
@@ -366,7 +370,7 @@
     <Style TargetType="TimePicker">
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
         <Setter Property="BackgroundColor" Value="Transparent"/>
-        <Setter Property="FontFamily" Value="OpenSansRegular"/>
+        <Setter Property="FontFamily" Value="Lexend-Meduim"/>
         <Setter Property="FontSize" Value="14"/>
         <Setter Property="MinimumHeightRequest" Value="44"/>
         <Setter Property="MinimumWidthRequest" Value="44"/>