diff --git a/code/src/Fitbot/app/build.gradle b/code/src/Fitbot/app/build.gradle
index 390414f..1348df8 100644
--- a/code/src/Fitbot/app/build.gradle
+++ b/code/src/Fitbot/app/build.gradle
@@ -30,7 +30,6 @@ android {
 
 dependencies {
 
-    implementation 'com.facebook.shimmer:shimmer:0.5.0'
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support.constraint:constraint-layout:2.0.4'
     implementation 'com.android.support:cardview-v7:28.0.0'
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 9ac90fd..6a58910 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
@@ -34,7 +34,6 @@ import com.example.fitbot.exercise.ExerciseManager;
 import com.example.fitbot.pepper.Pepper;
 import com.example.fitbot.util.NavigationManager;
 import com.example.fitbot.util.processing.InputProcessor;
-import com.facebook.shimmer.ShimmerFrameLayout;
 
 public class FitnessActivity extends RobotActivity implements RobotLifecycleCallbacks {
 
@@ -94,10 +93,6 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
         progressText = findViewById(R.id.progressText);
         progressCircle.setMax(maxProgress);
 
-        ShimmerFrameLayout shimmerLayout = findViewById(R.id.shimmerFrameLayout);
-        shimmerLayout.startShimmer(); // Start shimmer animation
-
-
         // Set color of loading circle
         ProgressBar loadingCircle = findViewById(R.id.loadingCircle);
         loadingCircle.setIndeterminateTintList(ColorStateList.valueOf(Color.RED));
@@ -166,9 +161,6 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
                     // exerciseDescriptionTextView.setText(exercise.description);
                     exerciseVideoUrl = exercise.videoUrl;
 
-                    ShimmerFrameLayout shimmerLayout = findViewById(R.id.shimmerFrameLayout);
-                    shimmerLayout.stopShimmer(); // Start shimmer animation
-
                     // Play the video
                     playVideo(videoView, this);
 
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 8b2e257..261cb35 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
@@ -60,81 +60,73 @@
 
     </LinearLayout>
 
-    <com.facebook.shimmer.ShimmerFrameLayout
-        android:id="@+id/shimmerFrameLayout"
+    <LinearLayout
         android:layout_width="450dp"
         android:layout_height="450dp"
         android:layout_marginTop="20dp"
         android:layout_marginEnd="20dp"
         android:background="@drawable/border_background"
+        android:orientation="vertical"
         android:padding="20dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
+        <TextView
+            android:id="@+id/textViewFitnessTitle"
+            style="@style/TextStyleTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:text="@string/exerciseTitle"
+            android:textAlignment="center" />
+
         <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_margin="10dp"
+            android:background="@drawable/border_background_3"
+            android:padding="5dp">
 
             <TextView
-                android:id="@+id/textViewFitnessTitle"
-                style="@style/TextStyleTitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:text="@string/exerciseTitle"
+                android:id="@+id/textViewFitnessShortDescription"
+                style="@style/TextStyleDesc"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:text="@string/exerciseDesc"
                 android:textAlignment="center" />
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_margin="10dp"
-                android:background="@drawable/border_background_3"
-                android:padding="5dp">
-
-                <TextView
-                    android:id="@+id/textViewFitnessShortDescription"
-                    style="@style/TextStyleDesc"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:text="@string/exerciseDesc"
-                    android:textAlignment="center" />
-            </LinearLayout>
-
-            <RelativeLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_margin="10dp"
-                android:background="@drawable/border_background_circle">
-
-                <ProgressBar
-                    android:id="@+id/progressCircle"
-                    style="?android:attr/progressBarStyleHorizontal"
-                    android:layout_width="150dp"
-                    android:layout_height="150dp"
-                    android:layout_centerInParent="true"
-                    android:layout_gravity="center"
-                    android:indeterminate="false"
-                    android:max="10"
-                    android:progress="0"
-                    android:progressDrawable="@drawable/progress_circle" />
-
-                <TextView
-                    android:id="@+id/progressText"
-                    style="@style/TextStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:text="0/10" />
-
-            </RelativeLayout>
-
         </LinearLayout>
 
-    </com.facebook.shimmer.ShimmerFrameLayout>
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_margin="10dp"
+            android:background="@drawable/border_background_circle">
 
+            <ProgressBar
+                android:id="@+id/progressCircle"
+                style="?android:attr/progressBarStyleHorizontal"
+                android:layout_width="150dp"
+                android:layout_height="150dp"
+                android:layout_centerInParent="true"
+                android:layout_gravity="center"
+                android:indeterminate="false"
+                android:max="10"
+                android:progress="0"
+                android:progressDrawable="@drawable/progress_circle" />
+
+            <TextView
+                android:id="@+id/progressText"
+                style="@style/TextStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:text="0/10" />
+
+        </RelativeLayout>
+
+    </LinearLayout>
 
     <Button
         android:id="@+id/homeButtonFitness"
diff --git a/code/src/Fitbot/gradle.properties b/code/src/Fitbot/gradle.properties
index a5efed8..2ab3bb7 100644
--- a/code/src/Fitbot/gradle.properties
+++ b/code/src/Fitbot/gradle.properties
@@ -15,5 +15,3 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
-android.useAndroidX=true
-android.enableJetifier=true