diff --git a/Qwirkle/QwirkleViews/MainPage.xaml b/Qwirkle/QwirkleViews/MainPage.xaml
index 29516a9..87660c6 100644
--- a/Qwirkle/QwirkleViews/MainPage.xaml
+++ b/Qwirkle/QwirkleViews/MainPage.xaml
@@ -31,9 +31,11 @@
             <controls:ButtonShadow Text="Rules"
                                    InfoClicked="OnRulesClicked"/>
 
-            <controls:ButtonShadow Text="Settings"/>
+            <controls:ButtonShadow Text="Settings"
+                                   InfoClicked="OnSettingsClicked"/>
 
-            <controls:ButtonShadow Text="Credits"/>
+            <controls:ButtonShadow Text="Credits"
+                                   InfoClicked="OnCreditsClicked"/>
 
         </VerticalStackLayout>
 
diff --git a/Qwirkle/QwirkleViews/MainPage.xaml.cs b/Qwirkle/QwirkleViews/MainPage.xaml.cs
index d37ff57..99a35e1 100644
--- a/Qwirkle/QwirkleViews/MainPage.xaml.cs
+++ b/Qwirkle/QwirkleViews/MainPage.xaml.cs
@@ -28,6 +28,16 @@ namespace Qwirkle
             Navigation.PushAsync(new Rules());
         }
 
+        public void OnSettingsClicked(object sender, EventArgs e)
+        {
+            Navigation.PushAsync(new Settings());
+        }
+
+        public void OnCreditsClicked(object sender, EventArgs e)
+        {
+            Navigation.PushAsync(new Credits());
+        }
+
     }
 
 }
diff --git a/Qwirkle/QwirkleViews/Pages/Credits.xaml b/Qwirkle/QwirkleViews/Pages/Credits.xaml
index b22251d..ffbf238 100644
--- a/Qwirkle/QwirkleViews/Pages/Credits.xaml
+++ b/Qwirkle/QwirkleViews/Pages/Credits.xaml
@@ -7,9 +7,6 @@
     <ScrollView>
         <VerticalStackLayout>
             <Grid Style="{StaticResource GridMain}">
-                <controls:GoBack
-                    InfoClicked="OnGoBackClicked"
-                        />
                 <controls:GoBack></controls:GoBack>
                 <Label Text="Credits"
                     Style="{StaticResource Title}"/>
diff --git a/Qwirkle/QwirkleViews/Pages/Credits.xaml.cs b/Qwirkle/QwirkleViews/Pages/Credits.xaml.cs
index 3230865..ee4bbce 100644
--- a/Qwirkle/QwirkleViews/Pages/Credits.xaml.cs
+++ b/Qwirkle/QwirkleViews/Pages/Credits.xaml.cs
@@ -6,8 +6,4 @@ public partial class Credits : ContentPage
 	{
 		InitializeComponent();
 	}
-    public void OnGoBackClicked(object sender, EventArgs e)
-    {
-        Navigation.PopAsync();
-    }
 }
\ No newline at end of file
diff --git a/Qwirkle/QwirkleViews/Pages/Settings.xaml b/Qwirkle/QwirkleViews/Pages/Settings.xaml
index a9595e9..d8c345c 100644
--- a/Qwirkle/QwirkleViews/Pages/Settings.xaml
+++ b/Qwirkle/QwirkleViews/Pages/Settings.xaml
@@ -8,9 +8,7 @@
         <VerticalStackLayout Spacing="25" Padding="5">
 
             <Grid Style="{StaticResource GridMain}">
-                <controls:GoBack
-                    InfoClicked="OnGoBackClicked"
-                    />
+                <controls:GoBack></controls:GoBack>
                 <Label Text="Settings"
                        Style="{StaticResource Title}"/>
             </Grid>