Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -rd66feb12d37023f6f67672ff4acdb5abebdbff15 -r39a514158384c0ad4bfcfb90bafbaa4ca8dc5a26
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision d66feb12d37023f6f67672ff4acdb5abebdbff15)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 39a514158384c0ad4bfcfb90bafbaa4ca8dc5a26)
@@ -86,28 +86,24 @@
         onResume                : { vTreatmentAdjustmentBloodPrime.doResume()                                   }
     }
 
-    Connections                 { target: vTreatmentAdjustmentBloodPrime
-        function onAdjustmentTriggered              ( vValue ) {
-            if (vTreatmentAdjustmentBloodPrime.adjustment_Accepted) {
-                _treatmentBloodPrime.notification.text = ""
-            }
-            else {
-                _treatmentBloodPrime.notification.text = vTreatmentAdjustmentBloodPrime.text()
-            }
-        }
-    }
-    Connections                 { target: vTreatmentAdjustmentBloodFlowRate
-        function onAdjustmentTriggered              ( vValue ) {
-            if (vTreatmentAdjustmentBloodPrime.adjustment_Accepted) {
-                _treatmentBloodPrime.notification.text = ""
-            }
-            else {
-                _treatmentBloodPrime.notification.text = vTreatmentAdjustmentBloodFlowRate.text()
-            }
-        }
-    }
-
     TreatmentHome               { id: _treatmentHome        }
+    ScreenItem                  { id: _treatmentTrends      } // TODO: make me!
+    TreatmentHeparin            { id: _treatmentHeparin     }
+    TreatmentHDF                { id: _treatmentHDF         }
+
+    // End Treatment
+    EndTreatmentRinsebackStack              { id:       _endTreatmentRinsebackStack         }
+    EndTreatmentRecirculateStack            { id:       _endTreatmentRecirculateStack       }
+
+    //// Treatment Adjustment Dialogs
+    TreatmentAdjustmentSetPoints            { id:       _treatmentAdjustmentSetPoints       }
+    TreatmentAdjustmentPressuresLimits      { id:       _treatmentAdjustmentPressuresLimits }
+    TreatmentAdjustmentBolusVolume          { id:       _treatmentAdjustmentBolusVolume     }
+    TreatmentAdjustmentUltrafiltrationStack { id:       _treatmentAdjustmentUltrafiltration }
+    TreatmentAdjustmentHDF                  { id:       _treatmentAdjustmentHDF             }
+    TreatmentAdjustmentDurationStack        { id:       _treatmentAdjustmentDuration        }
+    TreatmentAdjustmentVitalsInterval       { id:       _treatmentAdjustmentVitalsInterval  }
+
     Connections                 { target: _treatmentHome
         function onSectionFlowClicked               ( vValue ) {
             _treatmentAdjustmentSetPoints.open()
@@ -129,15 +125,6 @@
         }
     }
 
-    ScreenItem                  { id: _treatmentTrends      } // TODO: make me!
-    TreatmentHeparin            { id: _treatmentHeparin     }
-    Connections { target: _treatmentHeparin
-        function onIdleTimeout  ( ) {
-            _headerBar.headerMenuIndex = HeaderBar.Treatment // on heparin idle timeout go to main treatment
-        }
-    }
-
-    TreatmentHDF                { id: _treatmentHDF         }
     Connections                 { target: _treatmentHDF
         function onSectionPressuresClicked ( ) {
             _treatmentAdjustmentPressuresLimits.open()
@@ -149,19 +136,12 @@
         }
     }
 
-    // End Treatment
-    EndTreatmentRinsebackStack              { id:       _endTreatmentRinsebackStack         }
-    EndTreatmentRecirculateStack            { id:       _endTreatmentRecirculateStack       }
+    Connections { target: _treatmentHeparin
+        function onIdleTimeout  ( ) {
+            _headerBar.headerMenuIndex = HeaderBar.Treatment // on heparin idle timeout go to main treatment
+        }
+    }
 
-    //// Treatment Adjustment Dialogs
-    TreatmentAdjustmentSetPoints            { id:       _treatmentAdjustmentSetPoints       }
-    TreatmentAdjustmentPressuresLimits      { id:       _treatmentAdjustmentPressuresLimits }
-    TreatmentAdjustmentBolusVolume          { id:       _treatmentAdjustmentBolusVolume     }
-    TreatmentAdjustmentUltrafiltrationStack { id:       _treatmentAdjustmentUltrafiltration }
-    TreatmentAdjustmentHDF                  { id:       _treatmentAdjustmentHDF             }
-    TreatmentAdjustmentDurationStack        { id:       _treatmentAdjustmentDuration        }
-    TreatmentAdjustmentVitalsInterval       { id:       _treatmentAdjustmentVitalsInterval  }
-
     Connections                 { target:   _treatmentAdjustmentSetPoints
         function onConfirmClicked                   ( vValue ) {
             vTreatmentAdjustmentSetPoints.doAdjustment(
@@ -229,43 +209,32 @@
         }
     }
 
-    Connections { target: vTDOpMode
-        // The initail screen should be the Blood Prime, since that one is the earlier state in the list.
-        // also since it is being used in two stacks In-Treatment and also in End-Treatmet is has been defined in the MainStack.
-        function onInTreatmentChanged               ( vValue ) { page( _treatmentBloodPrime  , vValue   )}
-    }
-
-    Connections { target: _treatmentHome
-        function onVisibleChanged                   ( vValue ) {
-            if (_treatmentHome.visible) {
-                _mainMenu.hidden = true
-                _headerBar.menuHidden = false
+    Connections                 { target: vTreatmentAdjustmentBloodPrime
+        function onAdjustmentTriggered              ( vValue ) {
+            if (vTreatmentAdjustmentBloodPrime.adjustment_Accepted) {
+                _treatmentBloodPrime.notification.text = ""
             }
-        }
-    }
-
-    Connections { target: _treatmentBloodPrime
-        function onVisibleChanged                   ( vValue ) {
-            if (_treatmentBloodPrime.visible) {
-                _headerBar.menuHidden = true
+            else {
+                _treatmentBloodPrime.notification.text = vTreatmentAdjustmentBloodPrime.text()
             }
         }
     }
 
-    Connections { target: _endTreatmentRinsebackStack
-        function onVisibleChanged                   ( vValue ) {
-            if (_endTreatmentRinsebackStack.visible) {
-                _headerBar.menuHidden = true
+    Connections                 { target: vTreatmentAdjustmentBloodFlowRate
+        function onAdjustmentTriggered              ( vValue ) {
+            if (vTreatmentAdjustmentBloodPrime.adjustment_Accepted) {
+                _treatmentBloodPrime.notification.text = ""
             }
+            else {
+                _treatmentBloodPrime.notification.text = vTreatmentAdjustmentBloodFlowRate.text()
+            }
         }
     }
 
-    Connections { target: _endTreatmentRecirculateStack
-        function onVisibleChanged                   ( vValue ) {
-            if (_endTreatmentRecirculateStack.visible) {
-                _headerBar.menuHidden = true
-            }
-        }
+    Connections { target: vTDOpMode
+        // The initail screen should be the Blood Prime, since that one is the earlier state in the list.
+        // also since it is being used in two stacks In-Treatment and also in End-Treatmet is has been defined in the MainStack.
+        function onInTreatmentChanged               ( vValue ) { page( _treatmentBloodPrime  , vValue   )}
     }
 
     Connections { target: vTDTreatmentStates