diff --git a/Qwirkle/Qwirkle/Pages/Credits.xaml b/Qwirkle/Qwirkle/Pages/Credits.xaml
index fa38084..37f8ec7 100644
--- a/Qwirkle/Qwirkle/Pages/Credits.xaml
+++ b/Qwirkle/Qwirkle/Pages/Credits.xaml
@@ -2,17 +2,13 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Qwirkle.Pages.Credits"
+              xmlns:controls="clr-namespace:Qwirkle.Views"
              Title="Credits">
     <ScrollView>
         <VerticalStackLayout>
             <Grid ColumnDefinitions="*, 4*,*"
                   Margin="10, 0">
-                <Button Text="Go Back"
-                        Grid.Column="0"
-                        Grid.Row="0"
-                        HorizontalOptions="Start"
-                        VerticalOptions="Center"
-                />
+                <controls:GoBack></controls:GoBack>
                 <Label FontSize="Header"
                        Grid.Column="1"
                        Grid.Row="0"
diff --git a/Qwirkle/Qwirkle/Pages/Leaderboard.xaml b/Qwirkle/Qwirkle/Pages/Leaderboard.xaml
index e1d8236..ab455f0 100644
--- a/Qwirkle/Qwirkle/Pages/Leaderboard.xaml
+++ b/Qwirkle/Qwirkle/Pages/Leaderboard.xaml
@@ -9,12 +9,7 @@
         <VerticalStackLayout Spacing="25" Padding="5, 5, 5, 10">
             <Grid ColumnDefinitions="*, 4*,*"
                   Margin="10, 0">
-                <Button Text="Return"
-                        Grid.Column="0"
-                        Grid.Row="0"
-                        HorizontalOptions="Start"
-                        VerticalOptions="Center"
-                />
+                <controls:GoBack></controls:GoBack>
                 <Label FontSize="Header"
                        Grid.Column="1"
                        Grid.Row="0"
diff --git a/Qwirkle/Qwirkle/Pages/Scoreboard.xaml b/Qwirkle/Qwirkle/Pages/Scoreboard.xaml
index ed3fe1c..d21f5b7 100644
--- a/Qwirkle/Qwirkle/Pages/Scoreboard.xaml
+++ b/Qwirkle/Qwirkle/Pages/Scoreboard.xaml
@@ -8,7 +8,7 @@
         <VerticalStackLayout Spacing="25" Padding="5, 5, 5, 10">
             <Grid ColumnDefinitions="*, 4*,*"
                   Margin="10, 0">
-                <Button Text="Return"
+                <Button Text="Go Back"
                         Grid.Column="0"
                         Grid.Row="0"
                         HorizontalOptions="Start"
diff --git a/Qwirkle/Qwirkle/Pages/Settings.xaml b/Qwirkle/Qwirkle/Pages/Settings.xaml
index 8133ce7..0882120 100644
--- a/Qwirkle/Qwirkle/Pages/Settings.xaml
+++ b/Qwirkle/Qwirkle/Pages/Settings.xaml
@@ -2,14 +2,21 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Qwirkle.Pages.Settings"
+             xmlns:controls="clr-namespace:Qwirkle.Views"
              Title="Settings">
     <VerticalStackLayout>
 
-        <Label
-            Text="Settings"
-            FontSize="51"
-            VerticalOptions="Center" 
-            HorizontalOptions="Center" />
+        <Grid ColumnDefinitions="*, 4*,*"
+                  Margin="10, 0">
+            <controls:GoBack></controls:GoBack>
+            <Label FontSize="Header"
+                       Grid.Column="1"
+                       Grid.Row="0"
+                       FontAttributes="Bold"
+                       HorizontalOptions="Center"
+                       Padding="50, 10"
+                       Text="Settings"/>
+        </Grid>
 
         <HorizontalStackLayout>
             <Label 
@@ -33,11 +40,5 @@
             HorizontalOptions="Start"
          />
 
-        <Button Text="Return"
-                Margin="200"
-                HorizontalOptions="Center"
-                VerticalOptions="End"
-         />
-
     </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/Qwirkle/Qwirkle/Qwirkle.csproj b/Qwirkle/Qwirkle/Qwirkle.csproj
index 9d6eb72..c383b86 100644
--- a/Qwirkle/Qwirkle/Qwirkle.csproj
+++ b/Qwirkle/Qwirkle/Qwirkle.csproj
@@ -88,6 +88,9 @@
 	  <Compile Update="Pages\Settings.xaml.cs">
 	    <DependentUpon>Settings.xaml</DependentUpon>
 	  </Compile>
+	  <Compile Update="Views\GoBack.xaml.cs">
+	    <DependentUpon>GoBack.xaml</DependentUpon>
+	  </Compile>
 	  <Compile Update="Views\ScoreboardLine.xaml.cs">
 	    <DependentUpon>ScoreboardLine.xaml</DependentUpon>
 	  </Compile>
@@ -112,6 +115,9 @@
 	  <MauiXaml Update="Pages\Settings.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Views\GoBack.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Views\ScoreboardLine.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
diff --git a/Qwirkle/Qwirkle/Views/GoBack.xaml b/Qwirkle/Qwirkle/Views/GoBack.xaml
new file mode 100644
index 0000000..c5359b2
--- /dev/null
+++ b/Qwirkle/Qwirkle/Views/GoBack.xaml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Qwirkle.Views.GoBack">
+    <Button Text="Go Back"
+        Grid.Column="0"
+        Grid.Row="0"
+        HorizontalOptions="Start"
+        VerticalOptions="Center"
+    />
+</ContentView>
diff --git a/Qwirkle/Qwirkle/Views/GoBack.xaml.cs b/Qwirkle/Qwirkle/Views/GoBack.xaml.cs
new file mode 100644
index 0000000..3fe1504
--- /dev/null
+++ b/Qwirkle/Qwirkle/Views/GoBack.xaml.cs
@@ -0,0 +1,9 @@
+namespace Qwirkle.Views;
+
+public partial class GoBack : ContentView
+{
+	public GoBack()
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file