Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml
===================================================================
diff -u -r975e1964b60365b24c74be139c6b84369a7248ce -rf2aa3ee850de1023cfc011b845ed0364d251b749
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml	(.../TreatmentAdjustmentUltrafiltrationConfirm.qml)	(revision 975e1964b60365b24c74be139c6b84369a7248ce)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml	(.../TreatmentAdjustmentUltrafiltrationConfirm.qml)	(revision f2aa3ee850de1023cfc011b845ed0364d251b749)
@@ -21,6 +21,7 @@
 //  Qml imports
 import "qrc:/globals"
 import "qrc:/components"
+import "qrc:/compounds"
 
 /*!
  * \brief   TreatmentAdjustmentUltrafiltrationConfirm.qml is the screen
@@ -34,102 +35,48 @@
 
     signal confirmVolumeClicked(real vVolume)
 
-    Item { id: _contentArea
+    component ValueContainer: LabelUnitContainer { id: _valueContainer
+        property alias value        : _value.text
+        property color valueColor   : _value.color
+
+        implicitWidth       : 400
+        implicitHeight      : Variables.defaultButtonHeight
+        textPixelSize       : Fonts.fontPixelButton
+        contentItem: Text { id: _value
+            font {
+                pixelSize   : Fonts.fontPixelUltrafiltrationAdjustmentMetrics
+                weight      : Font.DemiBold
+            }
+            horizontalAlignment : Text.AlignHCenter
+            verticalAlignment   : Text.AlignVCenter
+            color               : Colors.ufVolumeGoalText
+        }
+    }
+
+    Item {
         anchors {
             top         : parent.top
             bottom      : _confirmButton.top
             left        : parent.left
             right       : parent.right
         }
 
-        Row { id: _contentRow
+        Row { id: _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
+                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
+                text        : qsTr("New UF Rate")
+                unitText    : Variables.unitTextRate
+                valueColor  : Colors.ufVolumeGoalText
+                value       : _root.ultrafiltrationRate.toFixed(Variables.ultrafiltrationPrecision)
             }
         }
     }