diff --git a/feature/dashboard/src/main/res/layout/fragment_main.xml b/feature/dashboard/src/main/res/layout/fragment_main.xml
index 9f0eff4c72..8cbdf5c1a0 100644
--- a/feature/dashboard/src/main/res/layout/fragment_main.xml
+++ b/feature/dashboard/src/main/res/layout/fragment_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -8,8 +8,12 @@
     android:theme="@style/Theme.Simprints">
 
     <com.google.android.material.appbar.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:id="@+id/appBarLayout"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/dashboardToolbar"
@@ -21,10 +25,13 @@
     </com.google.android.material.appbar.AppBarLayout>
 
     <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="?attr/actionBarSize"
-        android:background="?attr/colorPrimary">
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="?attr/colorPrimary"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/appBarLayout">
 
         <LinearLayout
             android:id="@+id/dashboard_cards"
@@ -60,12 +67,14 @@
 
         </LinearLayout>
     </ScrollView>
+
     <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/rootedDeviceError"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:id="@+id/rootedDeviceError"
-        android:visibility="gone"
-        android:background="@color/simprints_red">
+        android:background="@color/simprints_red"
+        android:visibility="gone">
+
         <TextView
             style="@style/Text.Headline5.White.Bold"
             android:layout_width="0dp"
@@ -74,12 +83,12 @@
             android:layout_marginBottom="24dp"
             android:gravity="center"
             android:maxLines="2"
+            android:text="@string/orchestrator_rooted_device_error_title"
             app:layout_constraintBottom_toTopOf="@id/alertImage"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintVertical_chainStyle="packed"
-            app:layout_constraintWidth_percent="0.8"
-            android:text="@string/orchestrator_rooted_device_error_title" />
+            app:layout_constraintWidth_percent="0.8" />
 
         <ImageView
             android:id="@+id/alertImage"
@@ -88,6 +97,7 @@
             android:layout_marginVertical="16dp"
             android:padding="16dp"
             android:scaleType="fitCenter"
+            android:src="@drawable/ic_alert_default"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHeight_percent="0.33"
@@ -95,8 +105,7 @@
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintVertical_bias="0.3"
             app:layout_constraintWidth_percent="0.5"
-            android:src="@drawable/ic_alert_default"
             tools:ignore="ContentDescription" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>