Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml
===================================================================
diff -u -reaa02e45b2d5f0910309bea7165963a539f9db97 -r71bb1dea18ee4340d90d894a7ab8e147b5977bb4
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml	(.../TreatmentAdjustmentUltrafiltrationStart.qml)	(revision eaa02e45b2d5f0910309bea7165963a539f9db97)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml	(.../TreatmentAdjustmentUltrafiltrationStart.qml)	(revision 71bb1dea18ee4340d90d894a7ab8e147b5977bb4)
@@ -27,10 +27,11 @@
  * \brief   TreatmentAdjustmentUltrafiltrationStart.qml is the screen
  *          To adjust the treatment ultrafiltration
  */
-TreatmentAdjustmentBase { id: _root
-    contentItem.objectName: "TreatmentAdjustmentUltrafiltrationStart"  //SquishQt testability
+Item { id: _root
+    objectName: "_TreatmentAdjustmentUltrafiltrationStart"  // SquishQt testability
 
     QtObject { id: _private
+        objectName: "_private"
         readonly property real minimum  : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Min
         readonly property real maximum  : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Max
         property real setVolume         : vTreatmentUltrafiltration.setVolume
@@ -42,46 +43,32 @@
     signal pauseClicked()
     signal resumeClicked()
 
-    confirmVisible: false
-
-    information {
-        visible     : true && information.text && ! notification.visible
-        imageSource : ufInfoImageSource
-        text        : ufInfoText
-        color           : Colors.ufNotificationBarBg
-        textColor       : Colors.ufVolumeGoalText
-        textfontSize    : Fonts.fontPixelUltrafiltrationAdjustmentNotification
-        textfontWeight  : Font.Medium
-    }
-
-    titleText   : qsTr("Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume
-
     TreatmentAdjustmentUltrafiltrationMetrics { id: _ufMetrics
+        objectName: "_ufMetrics"
         anchors {
             top             : parent.top
-            topMargin       : Variables.ultrafiltrationHeaderMargin
+            topMargin       : Variables.defaultMargin
             horizontalCenter: parent.horizontalCenter
         }
         setVolume       : _private.setVolume
         volumeRemoved   : _private.volumeRemoved
     }
 
     Item { id: _contentArea
+        objectName: "_contentArea"
         anchors {
             top         : _ufMetrics.bottom
-            bottom      : _pauseButton.top
+            bottom      : _buttonArea.top
             left        : parent.left
-            leftMargin  : 80
             right       : parent.right
-            rightMargin : anchors.leftMargin
         }
 
-        ProgressBarEx { id: _progressbarex
+        ProgressBarEx { id: _progressBarEx
+            objectName: "_progressBarEx"
             anchors {
-                left            : parent.left
-                right           : parent.right
-                verticalCenter  : parent.verticalCenter
+                centerIn    : parent
             }
+            width   : Variables.ultrafiltrationProgressBarWidth
             height  : Variables.ultraFiltrationProgressBarHeight
             decimal : Variables.ultrafiltrationPrecision
             minimum : _private.minimum
@@ -90,6 +77,7 @@
             valueEx : 0
             color   : Colors.ufProgressBarFill
             bgColor : Colors.ufAdjustmentDeltaFill
+            radius  : Variables.ultrafiltrationProgressBarRadius
             minText {
                 font {
                     pixelSize   : Fonts.fontPixelUltrafiltrationMinMaxLabel
@@ -108,10 +96,10 @@
             }
             marker {
                 width           : Variables.ultrafiltrationRangeMarkerWidth
-                handle.width    : Variables.ultrafiltrationRangeMarkerHandleWidth
+                hasHandle       : false
                 valueOnTop      : true
                 text {
-                    anchors.bottomMargin: marker.valueOnTop ? 13 : 0
+                    anchors.bottomMargin: Variables.ultrafiltrationRangeMarkerTextMargin
                     font {
                         pixelSize: Fonts.fontPixelUltrafiltrationRangeMarker
                         weight   : Font.DemiBold
@@ -121,41 +109,29 @@
         }
     }
 
-    TouchRect { id: _pauseButton
+    Row { id: _buttonArea
+        objectName: "_buttonArea"
         anchors {
-            bottom          : information.top
-            bottomMargin    : Variables.ultrafiltrationButtonBottomMargin
+            bottom          : parent.bottom
+            bottomMargin    : Variables.defaultMargin
             horizontalCenter: parent.horizontalCenter
         }
-        width       : Variables.defaultButtonWidth
-        height      : Variables.defaultButtonHeight
-        text {
-            text        : qsTr("Pause Ultrafiltration")
-            font.weight : Font.Medium
-        }
-        isDefault   : true
-        visible     : isUFPaused === false
-
-        onClicked   : _root.pauseClicked()
-    }
-
-    Row { id: _pausedButtonArea
-        anchors.centerIn    : _pauseButton
         spacing             : Variables.defaultMargin
-        visible             : ! _pauseButton.visible
 
-        TouchRect { id: _resumeButton
+        TouchRect { id: _pauseResumeButton
+            objectName  : "_pauseResumeButton"
             width       : Variables.defaultButtonWidth
             height      : Variables.defaultButtonHeight
             text {
-                text        : qsTr("Resume Ultrafiltration")
+                text        : isUFPaused ? qsTr("Resume UF") : qsTr("Pause UF")
                 font.weight : Font.Medium
             }
             isDefault   : true
-            onClicked   : _root.resumeClicked()
+            onClicked   : isUFPaused ? _root.resumeClicked() : _root.pauseClicked()
         }
 
         TouchRect { id: _editButton
+            objectName  : "_editButton"
             width       : Variables.defaultButtonWidth
             height      : Variables.defaultButtonHeight
             text {
@@ -167,6 +143,7 @@
         }
 
         TouchRect { id: _isolatedUfButton
+            objectName  : "_isolatedUfButton"
             width       : Variables.defaultButtonWidth
             height      : Variables.defaultButtonHeight
             text {
@@ -177,19 +154,4 @@
             onClicked   : _root.isolatedUfClicked()
         }
     }
-
-    Text { id: _informationText
-        text: qsTr("Note: Ultrafiltration must be paused to edit the volume.")
-        color: "#a3b7c9"
-        font {
-           pixelSize: 25
-       }
-
-        anchors {
-            bottom          : _pauseButton.top
-            bottomMargin    : 25
-            horizontalCenter: parent.horizontalCenter
-        }
-        visible: _pauseButton.visible
-    }
 }