diff --git a/omnipod-eros/src/main/res/layout/omnipod_pod_management.xml b/omnipod-eros/src/main/res/layout/omnipod_pod_management.xml
index 51010b34a2..95e617b815 100644
--- a/omnipod-eros/src/main/res/layout/omnipod_pod_management.xml
+++ b/omnipod-eros/src/main/res/layout/omnipod_pod_management.xml
@@ -1,195 +1,275 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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:id="@+id/omnipod_pod_management"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
     android:orientation="vertical"
     tools:context=".ui.PodManagementActivity">
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="20dp"
-        android:layout_marginRight="10dp"
-        android:layout_weight="0.5"
-        android:gravity="center"
-        android:text="@string/omnipod_pod_management_title"
-        android:textAlignment="center"
-        android:textSize="12pt"
-        android:textStyle="bold" />
-
-    <LinearLayout
-        android:id="@+id/waiting_for_rl_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:visibility="gone">
-
-        <ProgressBar
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:layout_marginLeft="25dp"
-            android:layout_marginTop="20dp"
-            android:layout_marginRight="25dp" />
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginRight="10dp"
-            android:layout_weight="0.5"
-            android:gravity="center"
-            android:text="@string/omnipod_pod_management_waiting_for_rileylink_connection"
-            android:textAlignment="center"
-            android:textSize="8pt" />
-    </LinearLayout>
+            <TextView
+                android:id="@+id/omnipod_pod_management_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="20dp"
+                android:layout_marginRight="10dp"
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="15dp"
-        android:paddingStart="15dp"
-        android:paddingEnd="15dp"
-        android:text="@string/omnipod_pod_management_heading_actions" />
+                android:gravity="center"
+                android:text="@string/omnipod_pod_management_title"
+                android:textAlignment="center"
+                android:textSize="12pt"
+                android:textStyle="bold" />
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingStart="10dp"
-        android:paddingEnd="10dp">
+            <LinearLayout
+                android:id="@+id/waiting_for_rl_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="gone">
 
-        <info.nightscout.androidaps.utils.ui.SingleClickButton
-            android:id="@+id/button_activate_pod"
-            style="?android:attr/buttonStyle"
-            android:layout_width="match_parent"
-            android:layout_height="fill_parent"
-            android:layout_marginEnd="4dp"
-            android:layout_weight="0.5"
-            android:drawableTop="@drawable/ic_pod_management_activate_pod"
-            android:text="@string/omnipod_pod_management_button_activate_pod"
-            android:textAllCaps="false" />
+                <ProgressBar
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:layout_marginLeft="25dp"
+                    android:layout_marginTop="20dp"
+                    android:layout_marginRight="25dp" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginRight="10dp"
+                    android:layout_weight="0.5"
+                    android:gravity="center"
+                    android:text="@string/omnipod_pod_management_waiting_for_rileylink_connection"
+                    android:textAlignment="center"
+                    android:textSize="8pt" />
+            </LinearLayout>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="15dp"
+                android:paddingStart="15dp"
+                android:paddingEnd="15dp"
+                android:text="@string/omnipod_pod_management_heading_actions" />
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+
+                android:id="@+id/Actions_Row_1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <androidx.constraintlayout.widget.Guideline
+                    android:id="@+id/Actions_Row_1_horizontal_guideline"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:orientation="horizontal"
+                    app:layout_constraintGuide_percent="0" />
+
+                <info.nightscout.androidaps.utils.ui.SingleClickButton
+                    android:id="@+id/button_activate_pod"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:drawableTop="@drawable/ic_pod_management_activate_pod"
+                    android:text="@string/omnipod_pod_management_button_activate_pod"
+                    android:textAllCaps="false"
+                    android:visibility="visible"
+                    app:layout_constrainedHeight="@+id/Actions_Row_1_horizontal_guideline"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toLeftOf="@+id/Actions_Col_1_Row_1_vertical_guideline"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <androidx.constraintlayout.widget.Guideline
+                    android:id="@+id/Actions_Col_1_Row_1_vertical_guideline"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical"
+                    app:layout_constraintGuide_percent="0.5" />
+
+                <info.nightscout.androidaps.utils.ui.SingleClickButton
+                    android:id="@+id/button_deactivate_pod"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:drawableTop="@drawable/ic_pod_management_deactivate_pod"
+                    android:text="@string/omnipod_pod_management_button_deactivate_pod"
+                    android:textAllCaps="false"
+                    android:visibility="visible"
+                    app:layout_constrainedHeight="@+id/Actions_Row_1_horizontal_guideline"
+                    app:layout_constraintLeft_toRightOf="@+id/Actions_Col_1_Row_1_vertical_guideline"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+
+                android:id="@+id/Actions_Row_2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <androidx.constraintlayout.widget.Guideline
+                    android:id="@+id/Actions_Row_2_horizontal_guideline"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:orientation="horizontal"
+                    app:layout_constraintGuide_percent="0" />
+
+                <info.nightscout.androidaps.utils.ui.SingleClickButton
+                    android:id="@+id/button_play_test_beep"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:drawableTop="@drawable/ic_pod_management_play_test_beep"
+                    android:text="@string/omnipod_pod_management_button_play_test_beep"
+                    android:textAllCaps="false"
+                    android:visibility="visible"
+                    app:layout_constrainedHeight="@+id/Actions_Row_2_horizontal_guideline"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toLeftOf="@+id/Actions_Col_1_Row_2_vertical_guideline"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <androidx.constraintlayout.widget.Guideline
+                    android:id="@+id/Actions_Col_1_Row_2_vertical_guideline"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical"
+                    app:layout_constraintGuide_percent="0.5" />
+
+                <info.nightscout.androidaps.utils.ui.SingleClickButton
+                    android:id="@+id/button_discard_pod"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:drawableTop="@drawable/ic_pod_management_discard_pod"
+                    android:text="@string/omnipod_pod_management_button_discard_pod"
+                    android:textAllCaps="false"
+                    android:visibility="gone"
+                    app:layout_constrainedHeight="@+id/Actions_Row_2_horizontal_guideline"
+                    app:layout_constraintHorizontal_bias="0.0"
+                    app:layout_constraintLeft_toRightOf="@+id/Actions_Col_1_Row_2_vertical_guideline"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
 
-        <info.nightscout.androidaps.utils.ui.SingleClickButton
-            android:id="@+id/button_deactivate_pod"
-            style="?android:attr/buttonStyle"
-            android:layout_width="match_parent"
-            android:layout_height="fill_parent"
-            android:layout_marginEnd="4dp"
-            android:layout_weight="0.5"
-            android:drawableTop="@drawable/ic_pod_management_deactivate_pod"
-            android:text="@string/omnipod_pod_management_button_deactivate_pod"
-            android:textAllCaps="false" />
-    </LinearLayout>
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="15dp"
+                android:paddingStart="15dp"
+                android:paddingEnd="15dp"
+                android:text="@string/omnipod_pod_management_heading_tools" />
 
-    <LinearLayout
+            <androidx.constraintlayout.widget.ConstraintLayout
 
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingStart="10dp"
-        android:paddingEnd="10dp">
+                android:id="@+id/Tools_Row_1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
-        <Button
-            android:id="@+id/button_play_test_beep"
-            style="?android:attr/buttonStyle"
-            android:layout_width="match_parent"
-            android:layout_height="fill_parent"
-            android:layout_marginEnd="4dp"
-            android:layout_weight="0.5"
-            android:drawableTop="@drawable/ic_pod_management_play_test_beep"
-            android:text="@string/omnipod_pod_management_button_play_test_beep"
-            android:textAllCaps="false" />
+                <androidx.constraintlayout.widget.Guideline
+                    android:id="@+id/Tools_Row_1_horizontal_guideline"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:orientation="horizontal"
+                    app:layout_constraintGuide_percent="0" />
 
+                <info.nightscout.androidaps.utils.ui.SingleClickButton
+                    android:id="@+id/button_reset_rileylink_config"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:drawableTop="@drawable/ic_pod_activity_reset_rileylink_config"
+                    android:text="@string/omnipod_pod_management_button_reset_riley_link_config"
+                    android:textAllCaps="false"
+                    android:visibility="visible"
+                    app:layout_constrainedHeight="@+id/Tools_Row_1_horizontal_guideline"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toLeftOf="@+id/Tools_Col_1_vertical_guideline"
+                    app:layout_constraintTop_toTopOf="parent" />
 
-        <info.nightscout.androidaps.utils.ui.SingleClickButton
-            android:id="@+id/button_discard_pod"
-            style="?android:attr/buttonStyle"
-            android:layout_width="match_parent"
-            android:layout_height="fill_parent"
-            android:layout_marginEnd="4dp"
-            android:layout_weight="0.5"
-            android:drawableTop="@drawable/ic_pod_management_discard_pod"
-            android:text="@string/omnipod_pod_management_button_discard_pod"
-            android:textAllCaps="false"
-            android:visibility="gone" />
+                <androidx.constraintlayout.widget.Guideline
+                    android:id="@+id/Tools_Col_1_vertical_guideline"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical"
+                    app:layout_constraintGuide_percent="0.5" />
 
-    </LinearLayout>
+                <info.nightscout.androidaps.utils.ui.SingleClickButton
+                    android:id="@+id/button_pod_history"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:drawableTop="@drawable/ic_pod_management_pod_history"
+                    android:text="@string/omnipod_pod_management_button_pod_history"
+                    android:textAllCaps="false"
+                    android:visibility="visible"
+                    app:layout_constrainedHeight="@+id/Tools_Row_1_horizontal_guideline"
+                    app:layout_constraintLeft_toRightOf="@+id/Tools_Col_1_vertical_guideline"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="15dp"
-        android:paddingStart="15dp"
-        android:paddingEnd="15dp"
-        android:text="@string/omnipod_pod_management_heading_tools" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingStart="10dp"
-        android:paddingEnd="10dp">
+            <androidx.constraintlayout.widget.ConstraintLayout
 
-        <info.nightscout.androidaps.utils.ui.SingleClickButton
-            android:id="@+id/button_pod_history"
-            style="?android:attr/buttonStyle"
-            android:layout_width="match_parent"
-            android:layout_height="fill_parent"
-            android:layout_marginEnd="4dp"
-            android:layout_weight="0.5"
-            android:drawableTop="@drawable/ic_pod_management_pod_history"
-            android:text="@string/omnipod_pod_management_button_pod_history"
-            android:textAllCaps="false" />
+                android:id="@+id/Tools_Row_2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
-        <info.nightscout.androidaps.utils.ui.SingleClickButton
-            android:id="@+id/button_rileylink_stats"
-            style="?android:attr/buttonStyle"
-            android:layout_width="match_parent"
-            android:layout_height="fill_parent"
-            android:layout_marginEnd="4dp"
-            android:layout_weight="0.5"
-            android:drawableTop="@drawable/ic_pod_management_rl_stats"
-            android:text="@string/omnipod_pod_management_button_riley_link_stats"
-            android:textAllCaps="false"
-            android:visibility="gone" />
+                <androidx.constraintlayout.widget.Guideline
+                    android:id="@+id/Tools_Row_2_horizontal_guideline"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:orientation="horizontal"
+                    app:layout_constraintGuide_percent="0" />
 
-    </LinearLayout>
+                <info.nightscout.androidaps.utils.ui.SingleClickButton
+                    android:id="@+id/button_rileylink_stats"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:drawableTop="@drawable/ic_pod_management_rl_stats"
+                    android:text="@string/omnipod_pod_management_button_riley_link_stats"
+                    android:textAllCaps="false"
+                    android:visibility="visible"
+                    app:layout_constrainedHeight="@+id/Tools_Row_2_horizontal_guideline"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toLeftOf="@+id/Tools_Col_1_Row_2_vertical_guideline"
+                    app:layout_constraintTop_toTopOf="parent" />
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingStart="10dp"
-        android:paddingEnd="10dp">
+                <androidx.constraintlayout.widget.Guideline
+                    android:id="@+id/Tools_Col_1_Row_2_vertical_guideline"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical"
+                    app:layout_constraintGuide_percent="0.5" />
 
-        <Button
-            android:id="@+id/button_pulse_log"
-            style="?android:attr/buttonStyle"
-            android:layout_width="match_parent"
-            android:layout_height="fill_parent"
-            android:layout_marginEnd="4dp"
-            android:layout_weight="0.5"
-            android:drawableTop="@drawable/ic_pod_management_pulse_log"
-            android:text="@string/omnipod_pod_management_button_read_pulse_log"
-            android:textAllCaps="false"
-            android:visibility="gone" />
+                <info.nightscout.androidaps.utils.ui.SingleClickButton
+                    android:id="@+id/button_pulse_log"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:drawableTop="@drawable/ic_pod_management_pulse_log"
+                    android:text="@string/omnipod_pod_management_button_read_pulse_log"
+                    android:textAllCaps="false"
+                    android:visibility="gone"
+                    app:layout_constrainedHeight="@+id/Tools_Row_2_horizontal_guideline"
+                    app:layout_constraintLeft_toRightOf="@+id/Tools_Col_1_Row_2_vertical_guideline"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
-        <info.nightscout.androidaps.utils.ui.SingleClickButton
-            android:id="@+id/button_reset_rileylink_config"
-            style="?android:attr/buttonStyle"
-            android:layout_width="match_parent"
-            android:layout_height="fill_parent"
-            android:layout_marginEnd="4dp"
-            android:layout_weight="0.5"
-            android:drawableTop="@drawable/ic_pod_activity_reset_rileylink_config"
-            android:text="@string/omnipod_pod_management_button_reset_riley_link_config"
-            android:textAllCaps="false" />
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </LinearLayout>
+</ScrollView>
\ No newline at end of file