Index: sources/gui/qml/compounds/TreatmentAdjustmentUltrafiltrationMetrics.qml
===================================================================
diff -u -r8672e62f205231b08dd7d4a4f6f7f3a60b2c677b -rad57884fca3e8a0916b6d6bf51a69264b9b5263f
--- sources/gui/qml/compounds/TreatmentAdjustmentUltrafiltrationMetrics.qml	(.../TreatmentAdjustmentUltrafiltrationMetrics.qml)	(revision 8672e62f205231b08dd7d4a4f6f7f3a60b2c677b)
+++ sources/gui/qml/compounds/TreatmentAdjustmentUltrafiltrationMetrics.qml	(.../TreatmentAdjustmentUltrafiltrationMetrics.qml)	(revision ad57884fca3e8a0916b6d6bf51a69264b9b5263f)
@@ -26,94 +26,42 @@
  *          that display the ultrafiltration volume removed and goal.
  */
 Item { id: _root
-    property real   setVolume           : 0
-    property real   volumeRemoved       : 0
-    property color  volumeRemovedColor  : Colors.fluidText
+    property alias  leftLabel   : _left.label
+    property alias  leftUnit    : _left.unit
+    property alias  leftValue   : _left.value
+    property alias  leftColor   : _left.valueColor
+    property alias  rightLabel  : _right.label
+    property alias  rightUnit   : _right.unit
+    property alias  rightValue  : _right.value
+    property alias  rightColor  : _right.valueColor
 
-    implicitWidth   : (_ufVolumeRemovedItem.width * 2) + Variables.columnSpacing
-    implicitHeight  : _ufVolumeRemovedItem.height
+    implicitWidth   : (_left.width * 2) + Variables.columnSpacing
+    implicitHeight  : _left.height
 
-    component ValueItem: Rectangle { id: _valueItem
-        property alias label        : _label.text
-        property alias value        : _value.text
-        property color textColor    : Colors.offWhite
-        anchors.centerIn    : parent
-        width               : 425
-        height              : Variables.adjustmentLabelUnitContainerHeight
-        radius              : 5
-        color               : Colors.panelBackgroundColor
-        border {
-            width   : Variables.panelBorderWidth
-            color   : Colors.panelBorderColor
-        }
-
-        Item { id: _contentItem
-            anchors.centerIn: parent
-            width           : childrenRect.width
-            height          : parent.height
-
-            Text { id: _label
-                anchors {
-                    left            : parent.left
-                    verticalCenter  : parent.verticalCenter
-                }
-                width   : contentWidth
-                color   : _valueItem.textColor
-                font {
-                    pixelSize   : 23
-                    weight      : Font.Medium
-                }
-            }
-
-            Text { id: _unit
-                anchors {
-                    left        : _label.right
-                    leftMargin  : 5
-                    baseline    : _label.baseline
-                }
-                width   : contentWidth
-                text    : ("(%1) :").arg(Variables.unitVolume)
-                color   : _valueItem.textColor
-                font {
-                    pixelSize   : 20
-                }
-            }
-
-            Text { id: _value
-                anchors{
-                    left        : _unit.right
-                    leftMargin  : 5
-                    baseline    : _label.baseline
-                }
-                width               : 60
-                horizontalAlignment : Text.AlignLeft
-                color               : _valueItem.textColor
-                font {
-                    pixelSize       : Fonts.fontPixelUltrafiltrationAdjustmentMetrics
-                    weight          : Font.DemiBold
-                }
-            }
-        }
-    }
-
-    ValueItem { id: _ufVolumeRemovedItem
+    LabelUnitText { id: _left
+        objectName  : "_left"
         anchors {
             horizontalCenter        : parent.horizontalCenter
             horizontalCenterOffset  : -(width + Variables.columnSpacing)/2
             verticalCenter          : parent.verticalCenter
         }
-        label   : qsTr("UF Volume Removed")
-        value   : _root.volumeRemoved.toFixed(Variables.ultrafiltrationPrecision)
+        width       : 420
+        label       : ""
+        unit        : ""
+        value       : ""
     }
 
-    ValueItem { id: _ufVolumeGoalItem
+    LabelUnitText { id: _right
+        objectName  : "_right"
         anchors {
             horizontalCenter        : parent.horizontalCenter
-            horizontalCenterOffset  : -(_ufVolumeRemovedItem.anchors.horizontalCenterOffset)
+            horizontalCenterOffset  : (width + Variables.columnSpacing)/2
             verticalCenter          : parent.verticalCenter
         }
-        textColor   : _root.volumeRemovedColor
+        width       : _left.width
         label       : qsTr("UF Volume Goal")
-        value       : _root.setVolume.toFixed(Variables.ultrafiltrationPrecision)
+        unit        : Variables.unitVolume
+        value       : _root.rightValue.toFixed(Variables.ultrafiltrationPrecision)
+        valueColor  : Colors.fluidText
     }
 }