Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -rcb9c48c7c307690dcafcfd16ef412fe660291692 -r975e1964b60365b24c74be139c6b84369a7248ce
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision cb9c48c7c307690dcafcfd16ef412fe660291692)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 975e1964b60365b24c74be139c6b84369a7248ce)
@@ -37,7 +37,7 @@
         _treatmentAdjustmentVitals          .close()
         _treatmentAdjustmentPressuresLimits .close()
         _treatmentAdjustmentDuration        .close()
-        _treatmentUltrafiltrationItem       .close()
+        _treatmentAdjustmentUltrafiltration .close()
 
         if (! visible) {
             _headerBar.menuHidden = true
@@ -46,22 +46,10 @@
 
     stackView.initialItem   : null
 
-    // ultrafiltration state information bar properties
-    readonly property bool   isUFPaused         : vTreatmentUltrafiltration.ufPaused
-    readonly property bool   isUFRunning        : vTreatmentUltrafiltration.ufRunning
     readonly property bool   isTreatmentPaused  : vTDTreatmentStates.txStop
 
-    readonly property string ufInfoImageSource  : isUFPaused    ? "qrc:/images/iPauseOrange" : ""
-    readonly property string ufInfoText         : isUFPaused    ? qsTr("Ultrafiltration Paused"    ) : ""
-    readonly property string ufInfoTextColor    : isUFPaused    ? "gray"  : ""
-
     readonly property bool   isSBInProgress     : ( vTDTreatmentStates.sbRunning || vTDTreatmentStates.sbWaitPump )
 
-    readonly property bool isDialogOpened : _treatmentAdjustmentFlow            .visible
-                                         || _treatmentAdjustmentPressuresLimits .visible
-                                         || _treatmentAdjustmentDuration        .visible
-                                         || _treatmentUltrafiltrationItem       .visible
-
     property int headerMenuIndex: _headerBar.headerMenuIndex
 
     onHeaderMenuIndexChanged: {
@@ -72,7 +60,6 @@
 
     // Components
     TreatmentBloodPrime         { id: _treatmentBloodPrime          }
-    TreatmentUltrafiltrationItem{ id: _treatmentUltrafiltrationItem }
     TreatmentHome               { id: _treatmentHome                }
 
     Connections                 { target: _treatmentHome
@@ -91,7 +78,7 @@
             _treatmentAdjustmentDuration.open()
         }
         function onSectionUltrafiltrationClicked    ( vValue ) {
-            _treatmentUltrafiltrationItem.open()
+            _treatmentAdjustmentUltrafiltration.open()
         }
     }
 
@@ -101,6 +88,7 @@
     //// Treatment Adjustment Dialogs
     TreatmentAdjustmentFlow             { id:       _treatmentAdjustmentFlow    }
     TreatmentAdjustmentPressuresLimits  { id:       _treatmentAdjustmentPressuresLimits    }
+    TreatmentAdjustmentUltrafiltration  { id:       _treatmentAdjustmentUltrafiltration }
 
     Connections                 { target:   _treatmentAdjustmentFlow
         function onConfirmClicked                   ( vValue ) { vTreatmentAdjustmentFlows.doAdjustment(