diff --git a/code/src/Fitbot/app/src/main/AndroidManifest.xml b/code/src/Fitbot/app/src/main/AndroidManifest.xml
index 33c9e33..12efb41 100644
--- a/code/src/Fitbot/app/src/main/AndroidManifest.xml
+++ b/code/src/Fitbot/app/src/main/AndroidManifest.xml
@@ -22,7 +22,7 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Fitbot" >
         <activity
-            android:name=".EndScreenActivity"
+            android:name=".ui.activities.EndScreenActivity"
             android:exported="false" />
         <activity
             android:name=".ui.activities.FitnessActivity"
diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/EndScreenActivity.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/EndScreenActivity.java
similarity index 50%
rename from code/src/Fitbot/app/src/main/java/com/example/fitbot/EndScreenActivity.java
rename to code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/EndScreenActivity.java
index 3670db5..157bebf 100644
--- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/EndScreenActivity.java
+++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/EndScreenActivity.java
@@ -1,10 +1,10 @@
-package com.example.fitbot;
+package com.example.fitbot.ui.activities;
 
-import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
-import android.widget.Button;
 
+import com.example.fitbot.R;
+import com.example.fitbot.ui.activities.FitnessActivity;
 import com.example.fitbot.ui.activities.MainActivity;
 
 public class EndScreenActivity extends AppCompatActivity {
@@ -13,12 +13,8 @@ public class EndScreenActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_end_screen);
-        Button homeButton = findViewById(R.id.homeButton);
 
-        homeButton.setOnClickListener(v -> {
-            Intent intent = new Intent(EndScreenActivity.this, MainActivity.class);
-            startActivity(intent);
-            finish();
-        });
+        com.example.fitbot.util.ButtonNavigation.setupButtonNavigation(this, R.id.homeButton, MainActivity.class);
+        com.example.fitbot.util.ButtonNavigation.setupButtonNavigation(this, R.id.continueButton, FitnessActivity.class);
     }
 }
\ No newline at end of file
diff --git a/code/src/Fitbot/app/src/main/res/layout/activity_end_screen.xml b/code/src/Fitbot/app/src/main/res/layout/activity_end_screen.xml
index 3ae57cc..fd3a2e9 100644
--- a/code/src/Fitbot/app/src/main/res/layout/activity_end_screen.xml
+++ b/code/src/Fitbot/app/src/main/res/layout/activity_end_screen.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".EndScreenActivity">
+    tools:context=".ui.activities.EndScreenActivity">
 
     <View
         android:id="@+id/myRectangleView"