Index: sources/gui/qml/compounds/TreatmentAdjustmentUltrafiltrationMetrics.qml
===================================================================
diff -u -r0022c3993c47e74c2d17c7f07f78fa1751a034f6 -rf8c80661c806c50047e81d581df0dd6e05f1c8ef
--- sources/gui/qml/compounds/TreatmentAdjustmentUltrafiltrationMetrics.qml	(.../TreatmentAdjustmentUltrafiltrationMetrics.qml)	(revision 0022c3993c47e74c2d17c7f07f78fa1751a034f6)
+++ sources/gui/qml/compounds/TreatmentAdjustmentUltrafiltrationMetrics.qml	(.../TreatmentAdjustmentUltrafiltrationMetrics.qml)	(revision f8c80661c806c50047e81d581df0dd6e05f1c8ef)
@@ -29,44 +29,63 @@
     property real setVolume     : 0
     property real volumeRemoved : 0
 
-    component ValueContainer: LabelUnitContainer { id: _valueContainer
-        property alias value: _value.text
-
+    component ValueItem: Rectangle { id: _valueItem
+        property alias label        : _label.text
+        property alias value        : _value.text
+        property color textColor    : Colors.fluidText
         anchors.centerIn    : parent
         width               : 350
         height              : 60
-        titleText.font {
-            pixelSize   : Fonts.fontPixelButton
-            weight      : Font.Medium
+        radius              : 5
+        color               : Colors.panelBackgroundColor
+        border {
+            width   : Variables.panelBorderWidth
+            color   : Colors.panelBorderColor
         }
 
-        contentItem: Item { id: _containerContentItem
+        Item { id: _textContainer
+            anchors.centerIn: parent
+            width           : childrenRect.width
+            height          : parent.height
+
+            Text { id: _label
+                anchors{
+                    left            : parent.left
+                    verticalCenter  : parent.verticalCenter
+                }
+                width   : contentWidth
+                color   : textColor
+                font {
+                    pixelSize       : Fonts.fontPixelButton
+                    weight          : Font.Medium
+                }
+            }
+
             Text { id: _value
-                anchors {
-                    right           : parent.right
-                    rightMargin     : Variables.defaultMargin
+                anchors{
+                    left            : _label.right
                     verticalCenter  : parent.verticalCenter
                 }
+                width   : contentWidth
+                color   : textColor
                 font {
-                    pixelSize   : Fonts.fontPixelUltrafiltrationAdjustmentMetrics
-                    weight      : Font.DemiBold
+                    pixelSize       : Fonts.fontPixelUltrafiltrationAdjustmentMetrics
+                    weight          : Font.DemiBold
                 }
-                color   : titleText.color
             }
         }
     }
 
-    ValueContainer { id: _volumeRemovedContainer
+    ValueItem { id: _ufVolumeRemovedItem
         anchors.horizontalCenterOffset  : -(width/2 + 30)
-        titleText.color                 : Colors.fluidText
-        text                            : qsTr("UF Volume Removed:")
+        label                           : qsTr("UF Volume Removed: ")
         value                           : _root.volumeRemoved.toFixed(Variables.ultrafiltrationPrecision)
     }
 
-    ValueContainer { id: _volumeGoalContainer
-        anchors.horizontalCenterOffset  : -(_volumeRemovedContainer.anchors.horizontalCenterOffset)
-        titleText.color                 : Colors.ufVolumeGoalText
-        text                            : qsTr("UF Volume Goal:")
+    ValueItem { id: _ufVolumeGoalItem
+        anchors.horizontalCenterOffset  : -(_ufVolumeRemovedItem.anchors.horizontalCenterOffset)
+        textColor                       : Colors.ufVolumeGoalText
+        label                           : qsTr("UF Volume Goal: ")
         value                           : _root.setVolume.toFixed(Variables.ultrafiltrationPrecision)
     }
 }