diff --git a/omnipod-common/src/main/res/layout/omnipod_common_overview_buttons.xml b/omnipod-common/src/main/res/layout/omnipod_common_overview_buttons.xml
index 50c2861bf3..14844d8efc 100644
--- a/omnipod-common/src/main/res/layout/omnipod_common_overview_buttons.xml
+++ b/omnipod-common/src/main/res/layout/omnipod_common_overview_buttons.xml
@@ -1,6 +1,9 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    tools:parentTag="android.widget.LinearLayout">
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/button_refresh_status"
@@ -65,4 +68,4 @@
         android:text="@string/omnipod_common_overview_button_suspend_delivery"
         android:visibility="gone" />
 
-</merge>
\ No newline at end of file
+</merge>
diff --git a/omnipod-common/src/main/res/layout/omnipod_common_overview_pod_info.xml b/omnipod-common/src/main/res/layout/omnipod_common_overview_pod_info.xml
index ff9e401287..9813bcd36b 100644
--- a/omnipod-common/src/main/res/layout/omnipod_common_overview_pod_info.xml
+++ b/omnipod-common/src/main/res/layout/omnipod_common_overview_pod_info.xml
@@ -2,24 +2,26 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:parentTag="android.widget.LinearLayout">
 
     <!-- Unique ID -->
     <LinearLayout
         android:id="@+id/omnipod_common_overview_pod_unique_id_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:focusable="true">
+        android:focusable="true"
+        android:orientation="horizontal">
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1.5"
-            android:textAlignment="viewEnd"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
             android:text="@string/omnipod_common_overview_pod_unique_id"
+            android:textAlignment="viewEnd"
             android:textSize="14sp" />
 
         <TextView
@@ -38,9 +40,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textAlignment="viewStart"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
+            android:textAlignment="viewStart"
             android:textSize="14sp" />
     </LinearLayout>
 
@@ -49,17 +51,17 @@
         android:id="@+id/omnipod_common_overview_lot_number_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:focusable="true">
+        android:focusable="true"
+        android:orientation="horizontal">
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1.5"
-            android:textAlignment="viewEnd"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
             android:text="@string/omnipod_common_overview_lot_number"
+            android:textAlignment="viewEnd"
             android:textSize="14sp" />
 
         <TextView
@@ -78,9 +80,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textAlignment="viewStart"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
+            android:textAlignment="viewStart"
             android:textSize="14sp" />
     </LinearLayout>
 
@@ -88,17 +90,17 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:focusable="true">
+        android:focusable="true"
+        android:orientation="horizontal">
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1.5"
-            android:textAlignment="viewEnd"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
             android:text="@string/omnipod_common_overview_pod_sequence_number"
+            android:textAlignment="viewEnd"
             android:textSize="14sp" />
 
         <TextView
@@ -117,9 +119,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textAlignment="viewStart"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
+            android:textAlignment="viewStart"
             android:textSize="14sp" />
     </LinearLayout>
 
@@ -127,17 +129,17 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:focusable="true">
+        android:focusable="true"
+        android:orientation="horizontal">
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1.5"
-            android:textAlignment="viewEnd"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
             android:text="@string/omnipod_common_overview_firmware_version"
+            android:textAlignment="viewEnd"
             android:textSize="14sp" />
 
         <TextView
@@ -156,9 +158,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textAlignment="viewStart"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
+            android:textAlignment="viewStart"
             android:textSize="14sp" />
     </LinearLayout>
 
@@ -166,17 +168,17 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:focusable="true">
+        android:focusable="true"
+        android:orientation="horizontal">
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1.5"
-            android:textAlignment="viewEnd"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
             android:text="@string/omnipod_common_overview_time_on_pod"
+            android:textAlignment="viewEnd"
             android:textSize="14sp" />
 
         <TextView
@@ -195,9 +197,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textAlignment="viewStart"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
+            android:textAlignment="viewStart"
             android:textSize="14sp" />
 
     </LinearLayout>
@@ -206,17 +208,17 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:focusable="true">
+        android:focusable="true"
+        android:orientation="horizontal">
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1.5"
-            android:textAlignment="viewEnd"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
             android:text="@string/omnipod_common_overview_pod_expiry_date"
+            android:textAlignment="viewEnd"
             android:textSize="14sp" />
 
         <TextView
@@ -235,9 +237,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textAlignment="viewStart"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
+            android:textAlignment="viewStart"
             android:textSize="14sp" />
 
     </LinearLayout>
@@ -246,17 +248,17 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:focusable="true">
+        android:focusable="true"
+        android:orientation="horizontal">
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1.5"
-            android:textAlignment="viewEnd"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
             android:text="@string/omnipod_common_overview_pod_status"
+            android:textAlignment="viewEnd"
             android:textSize="14sp" />
 
         <TextView
@@ -275,10 +277,10 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textAlignment="viewStart"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
             android:text=""
+            android:textAlignment="viewStart"
             android:textSize="14sp" />
 
     </LinearLayout>
@@ -302,17 +304,17 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:focusable="true">
+        android:focusable="true"
+        android:orientation="horizontal">
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1.5"
-            android:textAlignment="viewEnd"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
             android:text="@string/omnipod_common_overview_last_connection"
+            android:textAlignment="viewEnd"
             android:textSize="14sp" />
 
         <TextView
@@ -331,9 +333,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textAlignment="viewStart"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
+            android:textAlignment="viewStart"
             android:textSize="14sp" />
 
     </LinearLayout>
@@ -350,17 +352,17 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:focusable="true">
+        android:focusable="true"
+        android:orientation="horizontal">
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1.5"
-            android:textAlignment="viewEnd"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
             android:text="@string/omnipod_common_overview_last_bolus"
+            android:textAlignment="viewEnd"
             android:textSize="14sp" />
 
         <TextView
@@ -379,9 +381,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textAlignment="viewStart"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
+            android:textAlignment="viewStart"
             android:textSize="14sp" />
 
     </LinearLayout>
@@ -398,17 +400,17 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:focusable="true">
+        android:focusable="true"
+        android:orientation="horizontal">
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1.5"
-            android:textAlignment="viewEnd"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
             android:text="@string/omnipod_common_overview_base_basal_rate"
+            android:textAlignment="viewEnd"
             android:textSize="14sp" />
 
         <TextView
@@ -427,9 +429,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textAlignment="viewStart"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
+            android:textAlignment="viewStart"
             android:textSize="14sp" />
 
     </LinearLayout>
@@ -446,17 +448,17 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:focusable="true">
+        android:focusable="true"
+        android:orientation="horizontal">
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1.5"
-            android:textAlignment="viewEnd"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
             android:text="@string/omnipod_common_overview_temp_basal_rate"
+            android:textAlignment="viewEnd"
             android:textSize="14sp" />
 
         <TextView
@@ -475,9 +477,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textAlignment="viewStart"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
+            android:textAlignment="viewStart"
             android:textSize="14sp" />
 
     </LinearLayout>
@@ -494,17 +496,17 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:focusable="true">
+        android:focusable="true"
+        android:orientation="horizontal">
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1.5"
-            android:textAlignment="viewEnd"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
             android:text="@string/omnipod_common_overview_reservoir"
+            android:textAlignment="viewEnd"
             android:textSize="14sp" />
 
         <TextView
@@ -523,9 +525,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textAlignment="viewStart"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
+            android:textAlignment="viewStart"
             android:textSize="14sp" />
 
     </LinearLayout>
@@ -542,17 +544,17 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:focusable="true">
+        android:focusable="true"
+        android:orientation="horizontal">
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1.5"
-            android:textAlignment="viewEnd"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
             android:text="@string/omnipod_common_overview_total_delivered"
+            android:textAlignment="viewEnd"
             android:textSize="14sp" />
 
         <TextView
@@ -571,9 +573,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textAlignment="viewStart"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
+            android:textAlignment="viewStart"
             android:textSize="14sp" />
 
     </LinearLayout>
@@ -590,17 +592,17 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:focusable="true">
+        android:focusable="true"
+        android:orientation="horizontal">
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1.5"
-            android:textAlignment="viewEnd"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
             android:text="@string/omnipod_common_overview_errors"
+            android:textAlignment="viewEnd"
             android:textSize="14sp" />
 
         <TextView
@@ -619,9 +621,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textAlignment="viewStart"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
+            android:textAlignment="viewStart"
             android:textSize="14sp" />
 
     </LinearLayout>
@@ -638,17 +640,17 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:focusable="true">
+        android:focusable="true"
+        android:orientation="horizontal">
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1.5"
-            android:textAlignment="viewEnd"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
             android:text="@string/omnipod_common_overview_pod_active_alerts"
+            android:textAlignment="viewEnd"
             android:textSize="14sp" />
 
         <TextView
@@ -667,9 +669,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textAlignment="viewStart"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
+            android:textAlignment="viewStart"
             android:textSize="14sp" />
 
     </LinearLayout>
@@ -691,4 +693,5 @@
         android:rotationX="180"
         android:rotationY="180"
         app:drawableTopCompat="@drawable/ic_pod" />
-</merge>
\ No newline at end of file
+
+</merge>
diff --git a/omnipod-common/src/main/res/layout/omnipod_common_pod_deactivation_wizard_activity.xml b/omnipod-common/src/main/res/layout/omnipod_common_pod_deactivation_wizard_activity.xml
index f6143346a7..334bb28408 100644
--- a/omnipod-common/src/main/res/layout/omnipod_common_pod_deactivation_wizard_activity.xml
+++ b/omnipod-common/src/main/res/layout/omnipod_common_pod_deactivation_wizard_activity.xml
@@ -10,6 +10,6 @@
         android:name="androidx.navigation.fragment.NavHostFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-
         app:navGraph="@navigation/omnipod_common_pod_deactivation_wizard_navigation_graph" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/omnipod-dash/src/main/res/layout/omnipod_dash_overview_bluetooth_status.xml b/omnipod-dash/src/main/res/layout/omnipod_dash_overview_bluetooth_status.xml
index c4d2b73130..a117c1ce23 100644
--- a/omnipod-dash/src/main/res/layout/omnipod_dash_overview_bluetooth_status.xml
+++ b/omnipod-dash/src/main/res/layout/omnipod_dash_overview_bluetooth_status.xml
@@ -1,20 +1,22 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    tools:parentTag="android.widget.LinearLayout">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:focusable="true">
+        android:focusable="true"
+        android:orientation="horizontal">
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1.5"
-            android:textAlignment="viewEnd"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
             android:text="@string/omnipod_dash_overview_bluetooth_address"
+            android:textAlignment="viewEnd"
             android:textSize="14sp" />
 
         <TextView
@@ -33,26 +35,27 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textAlignment="viewStart"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
+            android:textAlignment="viewStart"
             android:textSize="14sp" />
+
     </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:focusable="true">
+        android:focusable="true"
+        android:orientation="horizontal">
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1.5"
-            android:textAlignment="viewEnd"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
             android:text="@string/omnipod_dash_overview_bluetooth_status"
+            android:textAlignment="viewEnd"
             android:textSize="14sp" />
 
         <TextView
@@ -71,9 +74,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textAlignment="viewStart"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
+            android:textAlignment="viewStart"
             android:textSize="14sp"
             tools:ignore="HardcodedText" />
     </LinearLayout>
@@ -82,18 +85,18 @@
         android:id="@+id/connectionQuality"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:focusable="true"
         android:orientation="horizontal"
-        android:visibility="gone"
-        android:focusable="true">
+        android:visibility="gone">
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1.5"
-            android:textAlignment="viewEnd"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
             android:text="@string/omnipod_dash_overview_bluetooth_connection_quality"
+            android:textAlignment="viewEnd"
             android:textSize="14sp" />
 
         <TextView
@@ -112,29 +115,30 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textAlignment="viewStart"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
+            android:textAlignment="viewStart"
             android:textSize="14sp"
             tools:ignore="HardcodedText" />
+
     </LinearLayout>
 
     <LinearLayout
         android:id="@+id/deliveryStatus"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:focusable="true"
         android:orientation="horizontal"
-        android:visibility="gone"
-        android:focusable="true">
+        android:visibility="gone">
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1.5"
-            android:textAlignment="viewEnd"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
             android:text="@string/omnipod_dash_overview_delivery_status"
+            android:textAlignment="viewEnd"
             android:textSize="14sp" />
 
         <TextView
@@ -153,11 +157,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textAlignment="viewStart"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
+            android:textAlignment="viewStart"
             android:textSize="14sp"
             tools:ignore="HardcodedText" />
+
     </LinearLayout>
 
     <View
diff --git a/omnipod-eros/src/main/res/layout/omnipod_eros_overview_riley_link_status.xml b/omnipod-eros/src/main/res/layout/omnipod_eros_overview_riley_link_status.xml
index ebf63b10a4..8034efcc7a 100644
--- a/omnipod-eros/src/main/res/layout/omnipod_eros_overview_riley_link_status.xml
+++ b/omnipod-eros/src/main/res/layout/omnipod_eros_overview_riley_link_status.xml
@@ -1,20 +1,22 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    tools:parentTag="android.widget.LinearLayout">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:focusable="true">
+        android:focusable="true"
+        android:orientation="horizontal">
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1.5"
-            android:textAlignment="viewEnd"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
             android:text="@string/rileylink_status"
+            android:textAlignment="viewEnd"
             android:textSize="14sp" />
 
         <TextView
@@ -33,10 +35,10 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textAlignment="viewStart"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
             android:text="{fa-bluetooth-b}"
+            android:textAlignment="viewStart"
             android:textSize="14sp"
             tools:ignore="HardcodedText" />