diff --git a/src/main/res/layout/sensor_item.xml b/src/main/res/layout/sensor_item.xml
index 4d89022bf..b2c80e31c 100644
--- a/src/main/res/layout/sensor_item.xml
+++ b/src/main/res/layout/sensor_item.xml
@@ -25,8 +25,9 @@
         android:id="@+id/stats_sensor_value"
         style="@style/StatsLargeValue"
         android:value="@string/value_unknown"
+        app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/stats_sensor_unit"
         app:layout_constraintTop_toBottomOf="@id/stats_sensor_sensor_value"
         tools:text="90" />
 
@@ -34,8 +35,8 @@
         android:id="@+id/stats_sensor_unit"
         style="@style/StatsUnit"
         tools:text="@string/sensor_unit_beats_per_minute"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintStart_toEndOf="@id/stats_sensor_value"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/stats_sensor_value" />
+        app:layout_constraintBottom_toBottomOf="@id/stats_sensor_value" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/src/main/res/values/do_not_translate.xml b/src/main/res/values/do_not_translate.xml
index ebe5bc591..5e8aa2bdb 100644
--- a/src/main/res/values/do_not_translate.xml
+++ b/src/main/res/values/do_not_translate.xml
@@ -25,9 +25,9 @@ limitations under the License.
 
     <string name="marker_icon_url" translatable="false">http://maps.google.com/mapfiles/ms/micons/blue-pushpin.png</string>
 
-    <string name="sensor_unit_beats_per_minute" translatable="false">BPM</string>
-    <string name="sensor_unit_rounds_per_minute" translatable="false">RPM</string>
-    <string name="sensor_unit_power" translatable="false">W</string>
+    <string name="sensor_unit_beats_per_minute" translatable="false">bpm</string>
+    <string name="sensor_unit_rounds_per_minute" translatable="false">rpm</string>
+    <string name="sensor_unit_power" translatable="false">w</string>
 
     <string name="value_unknown" translatable="false">-</string>