diff --git a/code/src/Fitbot/.idea/misc.xml b/code/src/Fitbot/.idea/misc.xml
index 48993be..ca880a9 100644
--- a/code/src/Fitbot/.idea/misc.xml
+++ b/code/src/Fitbot/.idea/misc.xml
@@ -25,6 +25,7 @@
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/drawable/border_background_3.xml" value="0.2475" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/drawable/box_background.xml" value="0.2555" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/drawable/darkred_button_gradient.xml" value="0.346" />
+        <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/drawable/fitbot_launcher_background.xml" value="0.2475" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/drawable/help2_background.xml" value="0.2395" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/drawable/help_background.xml" value="0.2395" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_home_48.xml" value="0.25" />
@@ -47,6 +48,7 @@
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/header.xml" value="0.264" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/toolbar.xml" value="0.264" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/menu/main_menu.xml" value="0.4" />
+        <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/mipmap-anydpi-v26/fitbot_launcher.xml" value="0.2475" />
         <entry key="app/src/main/res/layout/activity_end_screen.xml" value="0.1" />
         <entry key="app/src/main/res/layout/activity_fitness.xml" value="0.23550724637681159" />
         <entry key="app/src/main/res/layout/activity_main.xml" value="0.1" />
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 a29fc5c..7282278 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
@@ -3,6 +3,7 @@ package com.example.fitbot.ui.activities;
 import android.app.Dialog;
 import android.content.Context;
 import android.graphics.drawable.ColorDrawable;
+import android.media.MediaPlayer;
 import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
@@ -55,6 +56,7 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
 
     private static final float SENSOR_SAMPLE_RATE = 10.0f;
     private static final int EXERCISE_COUNT = 5;
+    private static int EXERCISE_REP = 10;
     private static final float EXERCISE_SPEED_MULTIPLIER = 1.0f;
 
     @Override
@@ -139,9 +141,20 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
                     // exerciseDescriptionTextView.setText(exercise.description);
                     exerciseVideoUrl = exercise.videoUrl;
 
+                    // Play the video
                     VideoView videoView = findViewById(R.id.videoView);
-                    Log.e("exerciseVideoUrl", "videoUrl:" + exerciseVideoUrl);
                     playVideo(videoView, this);
+
+                    // Set a listener to repeat the video
+                    while (EXERCISE_REP > 1) {
+                        videoView.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
+                            @Override
+                            public void onCompletion(MediaPlayer mp) {
+                                videoView.start(); // start the video again
+                            }
+                        });
+                        EXERCISE_REP--;
+                    }
                 });
             }
         })).start();
diff --git a/code/src/Fitbot/app/src/main/res/drawable/fitbot_launcher_background.xml b/code/src/Fitbot/app/src/main/res/drawable/fitbot_launcher_background.xml
index ca3826a..071825e 100644
--- a/code/src/Fitbot/app/src/main/res/drawable/fitbot_launcher_background.xml
+++ b/code/src/Fitbot/app/src/main/res/drawable/fitbot_launcher_background.xml
@@ -5,7 +5,7 @@
     android:viewportHeight="108"
     android:viewportWidth="108"
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#3DDC84"
+    <path android:fillColor="#00000000"
           android:pathData="M0,0h108v108h-108z"/>
     <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
           android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
diff --git a/code/src/Fitbot/app/src/main/res/layout/activity_fitness.xml b/code/src/Fitbot/app/src/main/res/layout/activity_fitness.xml
index fb8f702..f802f04 100644
--- a/code/src/Fitbot/app/src/main/res/layout/activity_fitness.xml
+++ b/code/src/Fitbot/app/src/main/res/layout/activity_fitness.xml
@@ -42,15 +42,23 @@
                 android:layout_margin="10dp"
                 tools:ignore="SpeakableTextPresentCheck" />
 
-            <VideoView
-                android:id="@+id/videoView"
+            <android.support.v7.widget.CardView
+                xmlns:card_view="http://schemas.android.com/apk/res-auto"
                 android:layout_width="300dp"
                 android:layout_height="300dp"
                 android:layout_centerInParent="true"
                 android:layout_marginStart="50dp"
                 android:layout_marginTop="50dp"
                 android:layout_marginEnd="50dp"
-                android:layout_marginBottom="50dp" />
+                android:layout_marginBottom="50dp"
+                card_view:cardCornerRadius="30dp">
+
+                <VideoView
+                    android:id="@+id/videoView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent" />
+
+            </android.support.v7.widget.CardView>
 
         </RelativeLayout>
 
@@ -61,9 +69,9 @@
             android:layout_marginVertical="20dp"
             android:layout_marginLeft="15dp"
             android:layout_marginRight="30dp"
+            android:padding="10dp"
             android:background="@drawable/border_background"
             android:orientation="vertical"
-            android:padding="20dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
@@ -75,15 +83,14 @@
                 android:layout_height="wrap_content"
                 android:text="@string/title"
                 android:textAlignment="center"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginBottom="5dp"/>
+                android:layout_gravity="center_horizontal" />
 
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="@drawable/border_background_3"
-                android:padding="16dp"
-                android:layout_margin="10dp"
+                android:padding="5dp"
+                android:layout_margin="5dp"
                 android:layout_gravity="center_horizontal">
 
                 <TextView
@@ -99,8 +106,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="@drawable/border_background_3"
-                android:padding="16dp"
-                android:layout_margin="10dp"
+                android:padding="5dp"
+                android:layout_margin="5dp"
                 android:layout_gravity="center_horizontal">
 
                 <TextView
@@ -116,8 +123,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="@drawable/border_background_3"
-                android:padding="16dp"
-                android:layout_margin="10dp"
+                android:padding="5dp"
+                android:layout_margin="5dp"
                 android:layout_gravity="center_horizontal">
 
                 <TextView