Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationEdit.qml
===================================================================
diff -u -r073d19de245f1b740c84251bd6bdd91ab01dd73d -rd948f4557217f1f0258e027a81e0b939a72fcae6
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationEdit.qml	(.../TreatmentAdjustmentDurationEdit.qml)	(revision 073d19de245f1b740c84251bd6bdd91ab01dd73d)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationEdit.qml	(.../TreatmentAdjustmentDurationEdit.qml)	(revision d948f4557217f1f0258e027a81e0b939a72fcae6)
@@ -49,29 +49,11 @@
         _newTreatmentDuration.value = _private.treatmentTimeTotal
     }
 
-    component LabelUnitText: LabelUnitContainer { id: _labelUnitText
-        objectName          : "_labelUnitText"
-
-        property alias valueText: _labelUnitContainerText.text
-
-        width               : (_infoRow.width - (_infoRow.spacing * 2)) / 3
-        height              : Variables.adjustmentLabelUnitContainerHeight
-        titleFontPixelSize  : Fonts.fontPixelContainerTitleSmall
-        unitText            : Variables.unitTextDialCond
-        unitFontPixelSize   : Fonts.fontPixelContainerUnitSmall
-
-        contentItem: Text { id: _labelUnitContainerText
-            objectName          : "_labelUnitContainerText"
-            anchors.centerIn    : parent
-            width               : contentWidth
-            height              : contentHeight
-            color               : Colors.offWhite
-            font.pixelSize      : Fonts.fontPixelValueControl
-        }
-    }
-
     Row { id: _infoRow
         objectName: "_infoRow"
+
+        readonly property int cellWidth: (_infoRow.width - (_infoRow.spacing * 2)) / 3
+
         anchors {
             top: parent.top
             topMargin: Variables.defaultMargin * 2
@@ -84,23 +66,26 @@
 
         LabelUnitText { id: _ufVolumeRemoved
             objectName  : "_ufVolumeRemoved"
-            text        : qsTr("UF Volume Removed")
-            unitText    : Variables.unitVolume
-            valueText   : _private.ufVolumeRemoved
+            width       : _infoRow.cellWidth
+            label       : qsTr("UF Volume Removed")
+            unit        : Variables.unitVolume
+            value       : _private.ufVolumeRemoved
         }
 
         LabelUnitText { id: _ufVolumeGoal
             objectName  : "_ufVolumeGoal"
-            text        : qsTr("UF Volume Goal")
-            unitText    : Variables.unitVolume
-            valueText   : _private.ufSetVolume
+            width       : _infoRow.cellWidth
+            label       : qsTr("UF Volume Goal")
+            unit        : Variables.unitVolume
+            value       : _private.ufSetVolume
         }
 
         LabelUnitText { id: _timeElapsed
             objectName  : "_timeElapsed"
-            text        : qsTr("Treatment Time Elapsed")
-            unitText    : Variables.unitTextDuration
-            valueText   : vTreatmentTime.time_Elapsed
+            width       : _infoRow.cellWidth
+            label       : qsTr("Treatment Time Elapsed")
+            unit        : Variables.unitTextDuration
+            value       : vTreatmentTime.time_Elapsed
         }
     }