Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r41a604f3fe3a5bb40bddd8c06e5fe88df85e3997 -rca05e940ea4a0c567acb05c4c8777dea079b0f08
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 41a604f3fe3a5bb40bddd8c06e5fe88df85e3997)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision ca05e940ea4a0c567acb05c4c8777dea079b0f08)
@@ -37,7 +37,7 @@
         _treatmentAdjustmentVitals          .close()
         _treatmentAdjustmentPressuresLimits .close()
         _treatmentAdjustmentDuration        .close()
-        _treatmentUltrafiltrationItem       .close()
+        _treatmentAdjustmentUltrafiltration .close()
 
         if (! visible) {
             _headerBar.menuHidden = true
@@ -46,24 +46,11 @@
 
     stackView.initialItem   : null
 
-    // ultrafiltration state information bar properties
-    readonly property bool   isUFPaused         : vTDTreatmentStates.ufPaused
-    readonly property bool   isUFRunning        : vTDTreatmentStates.ufRunning
     readonly property bool   isTreatmentPaused  : vTDTreatmentStates.txStop
-
-    readonly property string ufInfoImageSource  : isUFPaused    ? "qrc:/images/iPauseGray" : ""
-    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   isTreatmentEnd     : vTDTreatmentStates.txEnd
+             property int   headerMenuIndex     : _headerBar.headerMenuIndex
 
-    readonly property bool isDialogOpened : _treatmentAdjustmentFlow            .visible
-                                         || _treatmentAdjustmentPressuresLimits .visible
-                                         || _treatmentAdjustmentDuration        .visible
-                                         || _treatmentUltrafiltrationItem       .visible
-
-    property int headerMenuIndex: _headerBar.headerMenuIndex
-
     onHeaderMenuIndexChanged: {
         if ( _root.headerMenuIndex === 2)     page(_treatmentHeparin)
         if ( _root.headerMenuIndex === 1)     page(_treatmentTrends)
@@ -72,7 +59,6 @@
 
     // Components
     TreatmentBloodPrime         { id: _treatmentBloodPrime          }
-    TreatmentUltrafiltrationItem{ id: _treatmentUltrafiltrationItem }
     TreatmentHome               { id: _treatmentHome                }
 
     Connections                 { target: _treatmentHome
@@ -91,7 +77,7 @@
             _treatmentAdjustmentDuration.open()
         }
         function onSectionUltrafiltrationClicked    ( vValue ) {
-            _treatmentUltrafiltrationItem.open()
+            _treatmentAdjustmentUltrafiltration.open()
         }
     }
 
@@ -101,6 +87,7 @@
     //// Treatment Adjustment Dialogs
     TreatmentAdjustmentFlow             { id:       _treatmentAdjustmentFlow    }
     TreatmentAdjustmentPressuresLimits  { id:       _treatmentAdjustmentPressuresLimits    }
+    TreatmentAdjustmentUltrafiltration  { id:       _treatmentAdjustmentUltrafiltration }
 
     Connections                 { target:   _treatmentAdjustmentFlow
         function onConfirmClicked                   ( vValue ) { vTreatmentAdjustmentFlows.doAdjustment(
@@ -171,11 +158,12 @@
 
     Connections { target: vTDTreatmentStates
         // in-Treatmet
-        function onTxBloodPrimeChanged              ( vValue ) { page( _treatmentBloodPrime  , vValue   )}
-        function onTxDialysisChanged                ( vValue ) { page( _treatmentHome        , vValue   )}
+        function onTxBloodPrimeChanged              ( vValue ) { page( _treatmentBloodPrime  , vValue           )}
+        function onTxDialysisChanged                ( vValue ) { page( _treatmentHome        , vValue           )}
+        function onTxEndChanged                     ( vValue ) { if ( vValue ) {  _endTreatmentDialog.open()    }}
     }
 
     Connections { target: _mainHome
-        function onStartTreatment                   ( vValue ) { page( _treatmentHome                   )}
+        function onStartTreatment                   ( vValue ) { page( _treatmentHome                           )}
     }
 }