Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r6cad9b004e904200b71de7431c745795256080df -raabacb1dbdd30968ec8bc8ffc6c97263b09db71b
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 6cad9b004e904200b71de7431c745795256080df)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision aabacb1dbdd30968ec8bc8ffc6c97263b09db71b)
@@ -40,14 +40,27 @@
     // Views
     VTreatmentRanges            { id: vTreatmentRanges           }
     VTreatmentAdjustmentSaline  { id: vTreatmentAdjustmentSaline }
-    VHDTreatmentStates          { id: vHDTreatmentStates
-        property bool ufPaused  : ufState === GuiActions.UF_PAUSED_STATE
-        property bool txPaused  : subMode !== GuiActions.TREATMENT_DIALYSIS_STATE
-    }
+    VHDTreatmentStates          { id: vHDTreatmentStates         }
 
+    // ultrafiltration state information bar properties
+    readonly property bool   isUFPaused         : vTreatmentAdjustmentUltrafiltrationState.isPaused ||
+                                                  vHDTreatmentStates.ufPaused
+    readonly property bool   isUFOff            : vHDTreatmentStates.ufOff
+    readonly property bool   isUFRunning        : vHDTreatmentStates.ufRunning
+    readonly property bool   isUFCompleted      : vHDTreatmentStates.ufCompleted
+    readonly property string ufInfoImageSource  : isUFPaused    ? "qrc:/images/iPauseGray" :
+                                                  isUFOff       ? "qrc:/images/iOffGray"   :
+                                                  isUFCompleted ? "qrc:/images/iDone"      : ""
+    readonly property string ufInfoText         : isUFPaused    ? qsTr("Ultrafiltration is paused"    ) :
+                                                  isUFOff       ? qsTr("Ultrafiltration is off"       ) :
+                                                  isUFCompleted ? qsTr("Ultrafiltration is completed" ) : ""
+    readonly property string ufInfoTextColor    : isUFPaused    ? "gray"  :
+                                                  isUFOff       ? "gray"  :
+                                                  isUFCompleted ? "white" : ""
+
     // Components
     MainMenu                { id: _treatmentMenu
-        y               : -Variables.mainMenuHeight
+        y               : Variables.mainMenuHeight * -1
         position        : MainMenu.Position.Top
         hidden          : true
         titles          : [ qsTr("Back") , qsTr("Treatment") , qsTr("Trending") , qsTr("Settings") ]
@@ -73,35 +86,32 @@
             _treatmentAdjustmentDuration.open()
         }
         onSectionUltrafiltrationClicked: {
-            if (
-                    vTreatmentAdjustmentUltrafiltrationState.isPaused || // comes from the treatment adjustment
-                    vHDTreatmentStates.ufPaused                          // comes from the broadcast Treatment States salineState field
-            ) {
-                _treatmentAdjustmentUltrafiltrationPaused.open()
-            } else {
+            if ( isUFRunning ) {
                 _treatmentAdjustmentUltrafiltrationStart .open()
+            } else {
+                _treatmentAdjustmentUltrafiltrationPaused.open()
             }
         }
     }
 
     TreatmentCreate             { id:       _treatmentCreate
         onBackClicked          : pop()
-        onContinueClicked      : {vCreateTreatment.onFinishedCreate(); }
+        onContinueClicked      : vCreateTreatment.onFinishedCreate()
     }
 
     TreatmentConfirm             { id:       _treatmentConfirm
         onBackClicked           : pop()
-        onConfirmClicked        : {vCreateTreatment.onFinishedConfirm(); }
+        onConfirmClicked        : vCreateTreatment.onFinishedConfirm()
     }
 
     TreatmentPrime             { id:       _treatmentPrime
         onBackClicked           : pop()
-        onContinueClicked       : {vCreateTreatment.onFinishedPrime(); }
+        onContinueClicked       : vCreateTreatment.onFinishedPrime()
     }
 
     TreatmentBegin             { id:       _treatmentBegin
         onBackClicked           : pop()
-        onStartClicked          : {vCreateTreatment.onStart(); }
+        onStartClicked          : vCreateTreatment.onStart()
     }
 
 
@@ -235,5 +245,4 @@
         onShowPrime   : { push(_treatmentPrime) }
         onShowBegin   : { push(_treatmentBegin) }
     }
-
 }