diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java
index 5938d96..24d7764 100644
--- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java
+++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java
@@ -1,15 +1,13 @@
 package com.example.fitbot.ui.activities;
 
-import android.net.Uri;
 import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
 import android.widget.MediaController;
 import android.widget.VideoView;
 
 import com.aldebaran.qi.sdk.QiContext;
 import com.aldebaran.qi.sdk.RobotLifecycleCallbacks;
 import com.aldebaran.qi.sdk.design.activity.RobotActivity;
+import com.example.fitbot.EndScreenActivity;
 import com.example.fitbot.R;
 
 public class FitnessActivity extends RobotActivity implements RobotLifecycleCallbacks {
@@ -19,12 +17,16 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
         super.onCreate(savedInstanceState);
 
         VideoView videoView = findViewById(R.id.videoView);
-        videoView.setVideoURI(Uri.parse("android.resource://" + getPackageName() + "/" + R.raw.videofile));
+//        videoView.setVideoURI(Uri.parse("android.resource://" + getPackageName() + "/" + R.raw.videofile));
 
         MediaController mediaController = new MediaController(this);
         videoView.setMediaController(mediaController);
         videoView.start();
-    }
+
+            com.example.fitbot.util.ButtonNavigation.setupButtonNavigation(this, R.id.homeButton, MainActivity.class);
+            com.example.fitbot.util.ButtonNavigation.setupButtonNavigation(this, R.id.buttonComplete, EndScreenActivity.class);
+        }
+
 
 
     @Override
diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/ButtonNavigation.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/ButtonNavigation.java
new file mode 100644
index 0000000..1b20b2d
--- /dev/null
+++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/ButtonNavigation.java
@@ -0,0 +1,19 @@
+package com.example.fitbot.util;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.view.View;
+import android.widget.Button;
+
+public class ButtonNavigation {
+
+    public static void setupButtonNavigation(Activity currentActivity, int buttonId, Class<? extends Activity> targetActivity) {
+        Button button = currentActivity.findViewById(buttonId);
+        button.setOnClickListener(v -> {
+            Intent intent = new Intent(currentActivity, targetActivity);
+            currentActivity.startActivity(intent);
+            currentActivity.finish();
+        });
+    }
+}
\ No newline at end of file