diff --git a/code/src/Fitbot/app/src/main/res/layout/activity_main.xml b/code/src/Fitbot/app/src/main/res/layout/activity_main.xml
index 901a002..958965c 100644
--- a/code/src/Fitbot/app/src/main/res/layout/activity_main.xml
+++ b/code/src/Fitbot/app/src/main/res/layout/activity_main.xml
@@ -9,67 +9,77 @@
     tools:context=".ui.activities.MainActivity"
     tools:openDrawer="start">
 
-    <LinearLayout
+    <android.support.constraint.ConstraintLayout
+        android:id="@+id/linearLayout2"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:orientation="horizontal">
 
         <include
             android:id="@+id/toolbar"
-            layout="@layout/toolbar" />
+            layout="@layout/toolbar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
 
         <TextView
             android:id="@+id/textView2"
-            android:layout_width="524dp"
-            android:layout_height="77dp"
-            android:layout_marginStart="378dp"
-            android:layout_marginTop="80dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="300dp"
             android:text="@string/welkom_bij_fitbot"
             android:textColor="@color/white"
-            android:textSize="64sp" />
+            android:textSize="64sp"
+            app:layout_constraintStart_toStartOf="parent" />
 
         <TextView
             android:id="@+id/textView3"
-            android:layout_width="510dp"
-            android:layout_height="39dp"
-            android:layout_marginStart="385dp"
-            android:layout_marginTop="0dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="300dp"
+            android:layout_marginTop="80dp"
             android:text="@string/robot_helpt"
             android:textColor="@color/white"
-            android:textSize="32sp" />
+            android:textSize="32sp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <Button
             android:id="@+id/startButton"
-            android:layout_width="300dp"
-            android:layout_height="150dp"
-            android:layout_marginStart="490dp"
-            android:layout_marginTop="100dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="400dp"
+            android:layout_marginTop="350dp"
+            android:background="@drawable/red_button_gradient"
             android:text="@string/start"
+            android:textAllCaps="false"
             android:textColor="@color/white"
             android:textSize="80sp"
-            android:textAllCaps="false"
-            android:background="@drawable/red_button_gradient"/>
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <Button
             android:id="@+id/helpButton"
-            android:layout_width="160dp"
-            android:layout_height="80dp"
-            android:layout_marginStart="560dp"
-            android:layout_marginTop="20dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="450dp"
+            android:layout_marginTop="500dp"
+            android:background="@drawable/darkred_button_gradient"
             android:text="@string/help"
+            android:textAllCaps="false"
             android:textColor="@color/white"
             android:textSize="40sp"
-            android:textAllCaps="false"
-            android:background="@drawable/darkred_button_gradient"/>
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
             android:id="@+id/imageView2"
-            android:layout_width="375dp"
-            android:layout_height="375dp"
-            android:layout_marginStart="0dp"
-            android:layout_marginTop="-180dp"
-            app:srcCompat="@drawable/robot_logo_inverted"
-            android:contentDescription="@string/todo" />
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="260dp"
+            android:contentDescription="@string/todo"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/robot_logo_inverted" />
 
         <!--    <Button-->
         <!--        android:id="@+id/menu_switch_btn"-->
@@ -81,7 +91,7 @@
         <!--        app:layout_constraintLeft_toLeftOf="parent"-->
         <!--        android:focusable="true" />-->
 
-    </LinearLayout>
+    </android.support.constraint.ConstraintLayout>
 
     <android.support.design.widget.NavigationView
         android:id="@+id/nav_view"