Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml
===================================================================
diff -u -reaa02e45b2d5f0910309bea7165963a539f9db97 -r975e1964b60365b24c74be139c6b84369a7248ce
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml	(.../TreatmentAdjustmentUltrafiltrationStart.qml)	(revision eaa02e45b2d5f0910309bea7165963a539f9db97)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml	(.../TreatmentAdjustmentUltrafiltrationStart.qml)	(revision 975e1964b60365b24c74be139c6b84369a7248ce)
@@ -27,8 +27,8 @@
  * \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
         readonly property real minimum  : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Min
@@ -42,24 +42,10 @@
     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
         anchors {
             top             : parent.top
-            topMargin       : Variables.ultrafiltrationHeaderMargin
+            topMargin       : Variables.defaultMargin
             horizontalCenter: parent.horizontalCenter
         }
         setVolume       : _private.setVolume
@@ -69,7 +55,7 @@
     Item { id: _contentArea
         anchors {
             top         : _ufMetrics.bottom
-            bottom      : _pauseButton.top
+            bottom      : _buttonArea.top
             left        : parent.left
             leftMargin  : 80
             right       : parent.right
@@ -121,38 +107,23 @@
         }
     }
 
-    TouchRect { id: _pauseButton
+    Row { id: _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
             width       : Variables.defaultButtonWidth
             height      : Variables.defaultButtonHeight
             text {
-                text        : qsTr("Resume Ultrafiltration")
+                text        : isUFPaused ? qsTr("Resume Ultrafiltration") : qsTr("Pause Ultrafiltration")
                 font.weight : Font.Medium
             }
             isDefault   : true
-            onClicked   : _root.resumeClicked()
+            onClicked   : isUFPaused ? _root.resumeClicked() : _root.pauseClicked()
         }
 
         TouchRect { id: _editButton
@@ -177,19 +148,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
-    }
 }