diff --git a/code/server/incoming_request_handlers.js b/code/server/incoming_request_handlers.js
index c4bb70b..1f8d257 100644
--- a/code/server/incoming_request_handlers.js
+++ b/code/server/incoming_request_handlers.js
@@ -32,11 +32,15 @@ function handleIncoming(request, response, app, pool)
                         // Send back the data in the right format
                         let converted = rows.map(row => {
                             return {
+                                exerciseId: row.ExerciseID,
                                 name: row.Name,
-                                description: row.Description,
                                 muscleGroup: row.MuscleGroup,
+                                shortDescription: row.ShortDescription,
+                                description: row.Description,
                                 imageUrl: row.ImageURL,
-                                videoUrl: row.VideoURL
+                                videoUrl: row.VideoURL,
+                                path: row.Path,
+                                duration: row.Duration
                             };
                         });
 
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 a619a72..e597559 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
@@ -45,7 +45,7 @@ tools:openDrawer="start">
         android:layout_width="150dp"
         android:layout_height="75dp"
         android:layout_marginStart="404dp"
-        android:layout_marginBottom="30dp"
+        android:layout_marginBottom="0dp"
         android:background="@drawable/red_button_gradient"
         android:drawableTop="@drawable/ic_baseline_home_48"
         android:drawableTint="@color/white"