Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml
===================================================================
diff -u -r9e583bc0edb0dd929a03132cc57c252d0bd5aaac -r8672e62f205231b08dd7d4a4f6f7f3a60b2c677b
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml	(.../TreatmentAdjustmentUltrafiltrationConfirm.qml)	(revision 9e583bc0edb0dd929a03132cc57c252d0bd5aaac)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml	(.../TreatmentAdjustmentUltrafiltrationConfirm.qml)	(revision 8672e62f205231b08dd7d4a4f6f7f3a60b2c677b)
@@ -21,139 +21,77 @@
 //  Qml imports
 import "qrc:/globals"
 import "qrc:/components"
+import "qrc:/compounds"
 
 /*!
  * \brief   TreatmentAdjustmentUltrafiltrationConfirm.qml is the screen
  *          to confirm requested changes to the treatment ultrafiltration setting.
  */
-TreatmentAdjustmentBase { id: _root
-    contentItem.objectName: "TreatmentAdjustmentUltrafiltrationConfirm"  //SquishQt testability
+Item { id: _root
+    objectName: "_TreatmentAdjustmentUltrafiltrationConfirm"  // SquishQt testability
 
     property real ultrafiltrationVolume : 0.000
     property real ultrafiltrationRate   : 0.000
 
     signal confirmVolumeClicked(real vVolume)
 
-      closeVisible  : false
-    confirmVisible  : false
-       backVisible  : true
+    component ValueContainer: LabelUnitContainer { id: _valueContainer
+        objectName                  : "_valueContainer"
+        property alias value        : _value.text
+        property color valueColor   : _value.color
 
-   information {
-        visible         : true && information.text && ! notification.visible
-        imageSource     : ufInfoImageSource
-        text            : ufInfoText
-        color           : Colors.ufNotificationBarBg
-        textColor       : Colors.ufVolumeGoalText
-        textfontSize    : Fonts.fontPixelUltrafiltrationAdjustmentNotification
-        textfontWeight  : Font.Medium
+        implicitWidth       : Variables.ultrafiltrationConfirmValueWidth
+        implicitHeight      : Variables.adjustmentLabelUnitContainerHeight
+
+        contentItem: Text { id: _value
+            objectName: "_value"
+            font {
+                pixelSize   : Fonts.fontPixelUltrafiltrationAdjustmentMetrics
+                weight      : Font.DemiBold
+            }
+            horizontalAlignment : Text.AlignHCenter
+            verticalAlignment   : Text.AlignVCenter
+            color               : Colors.ufVolumeGoalText
+        }
     }
 
-    titleText   : qsTr("Confirm Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume
-
-    Item { id: _contentArea
+    Item { id: _newValuesItem
+        objectName: "_newValuesItem"
         anchors {
             top         : parent.top
             bottom      : _confirmButton.top
             left        : parent.left
             right       : parent.right
         }
 
-        Row { id: _contentRow
+        Row { id: _newValuesRow
+            objectName      : "_newValuesRow"
             anchors.centerIn: parent
-            spacing         : 150
+            spacing         : Variables.columnSpacing
 
-            Column { id: _leftContent
-                spacing: 20
-                Text {
-                    font {
-                        pixelSize   : Fonts.fontPixelUltrafiltrationAdjustmentNotification
-                        weight      : Font.Medium
-                    }
-                    color   : "white"
-                    text    : qsTr("New UF Volume:")
-                }
-
-                Item {
-                    width   : childrenRect.width
-                    height  : childrenRect.height
-
-                    Text { id: _newUfVolumeValue
-                        width: contentWidth
-                        font {
-                            pixelSize       : Fonts.fontPixelUltrafiltrationAdjustmentConfirmation
-                            weight          : Font.DemiBold
-                        }
-                        horizontalAlignment : Text.AlignVBottom
-                        color               : Colors.ufVolumeGoalText
-                        text                : _root.ultrafiltrationVolume.toFixed(Variables.ultrafiltrationPrecision)
-                    }
-
-                    Text { id: _newUfVolumeUnit
-                        anchors { 
-                            left                : _newUfVolumeValue.right
-                            verticalCenter      : _newUfVolumeValue.verticalCenter
-                            verticalCenterOffset: (_newUfVolumeValue.height - height) * 0.25
-                        }
-                        font {
-                            pixelSize       : _newUfVolumeValue.font.pixelSize * 0.6
-                            weight          : Font.Medium
-                        }
-                        horizontalAlignment : Text.AlignVBottom
-                        color               : _newUfVolumeValue.color
-                        text                : " " + Variables.unitVolume
-                    }
-                }
+            ValueContainer { id: _newVolumeContainer
+                objectName  : "_newVolumeContainer"
+                text        : qsTr("New UF Volume")
+                unitText    : Variables.unitVolume
+                valueColor  : Colors.ufVolumeGoalText
+                value       : _root.ultrafiltrationVolume.toFixed(Variables.ultrafiltrationPrecision)
             }
 
-            Column { id: _rightContent
-                spacing: _leftContent.spacing
-                Text {
-                    font {
-                        pixelSize   : Fonts.fontPixelUltrafiltrationAdjustmentNotification
-                        weight      : Font.Medium
-                    }
-                    color   : "white"
-                    text    : qsTr("New UF Rate:")
-                }
-
-                Item {
-                    width   : childrenRect.width
-                    height  : childrenRect.height
-
-                    Text { id: _newUfRateValue
-                        width: contentWidth
-                        font {
-                            pixelSize   : Fonts.fontPixelUltrafiltrationAdjustmentConfirmation
-                            weight      : Font.DemiBold
-                        }
-                        horizontalAlignment : Text.AlignVCenter
-                        color               : Colors.ufVolumeGoalText
-                        text                : _root.ultrafiltrationRate.toFixed(Variables.ultrafiltrationPrecision)
-                    }
-
-                    Text { id: _newUfRateUnit
-                        anchors {
-                            left                : _newUfRateValue.right
-                            verticalCenter      : _newUfRateValue.verticalCenter
-                            verticalCenterOffset: (_newUfRateValue.height - height) * 0.25
-                        }
-                        font {
-                            pixelSize   : _newUfVolumeUnit.font.pixelSize
-                            weight      : _newUfVolumeUnit.font.weight
-                        }
-                        horizontalAlignment : Text.AlignVCenter
-                        color               : _newUfVolumeValue.color
-                        text                : " " + Variables.unitTextRate
-                    }
-                }
+            ValueContainer { id: _newRateContainer
+                objectName  : "_newRateContainer"
+                text        : qsTr("New UF Rate")
+                unitText    : Variables.unitTextRate
+                valueColor  : Colors.ufVolumeGoalText
+                value       : _root.ultrafiltrationRate.toFixed(Variables.ultrafiltrationPrecision)
             }
         }
     }
 
     TouchRect { id: _confirmButton
+        objectName  : "_confirmButton"
         anchors {
-            bottom          : information.top
-            bottomMargin    : Variables.ultrafiltrationButtonBottomMargin
+            bottom          : parent.bottom
+            bottomMargin    : Variables.defaultMargin
             horizontalCenter: parent.horizontalCenter
         }
         width       : Variables.ultrafiltrationButtonWidth