Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r43ae56f762e6f3e1416d39e3d16f9103fc597e41 -rf8e37a0cbb537edceebee7a7c5f2676f497d1e26
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 43ae56f762e6f3e1416d39e3d16f9103fc597e41)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision f8e37a0cbb537edceebee7a7c5f2676f497d1e26)
@@ -15,12 +15,12 @@
 
 // Qt
 import QtQuick 2.12
-//import QtCharts 2.3
 
 //  Qml imports
-import "qrc:/globals"
 import "qrc:/components"
 import "qrc:/compounds"
+import "qrc:/dialogs"
+import "qrc:/globals"
 import "qrc:/pages/treatment/adjustments"
 
 /*!
@@ -38,6 +38,10 @@
         _treatmentAdjustmentPressuresLimits .close()
         _treatmentAdjustmentDuration        .close()
         _treatmentUltrafiltrationItem       .close()
+
+        if (! visible) {
+            _headerBar.menuHidden = true
+        }
     }
 
     stackView.initialItem   : null
@@ -55,28 +59,16 @@
                                          || _treatmentAdjustmentPressuresLimits .visible
                                          || _treatmentAdjustmentDuration        .visible
                                          || _treatmentUltrafiltrationItem       .visible
-    // Components
-    MainMenu            { id: _treatmentMenu
-        y               : Variables.mainMenuHeight * -1
-        position        : MainMenu.Position.Top
-        hidden          : true
-        titles          : [ qsTr("Treatment") , qsTr("Trending") , qsTr("Settings") ]
-        visibleItems    : [       true        ,       false      ,       false      ]
-        spacing         :  20
-        leftPdding      :  20
-        rightPdding     :  50
-        partitionWidth  : 100 // Todo Important : max width should be the width for all bottons
-        hasRightText    : true
-        hasLogo         : true
-        /* ----- TEST: Under the test code, for the plotting of the items -----
-        onCurrentIndexChanged: {
-            console.debug(currentIndex)
-            if (currentIndex == 1) push(_treatmentTrending)
-            if (currentIndex == 0) pop()
-        }
-        */
+
+    property int headerMenuIndex: _headerBar.headerMenuIndex
+
+    onHeaderMenuIndexChanged: {
+        if ( _root.headerMenuIndex === 2)     page(_treatmentHeparin)
+        if ( _root.headerMenuIndex === 1)     page(_treatmentTrends)
+        if ( _root.headerMenuIndex === 0)     pop(null) // unwind stack
     }
 
+    // Components
     TreatmentBloodPrime         { id: _treatmentBloodPrime          }
     TreatmentUltrafiltrationItem{ id: _treatmentUltrafiltrationItem }
     TreatmentHome               { id: _treatmentHome                }
@@ -101,7 +93,8 @@
         }
     }
 
-    ScreenItem                  { id: _treatmentTrending    }
+    ScreenItem                  { id: _treatmentTrends      } // TODO: make me!
+    ScreenItem                  { id: _treatmentHeparin     } // TODO: make me!
 
     //// Treatment Adjustment Dialogs
     TreatmentAdjustmentFlow             { id:       _treatmentAdjustmentFlow    }
@@ -144,6 +137,7 @@
                         _bphrEntry.diastolic  ,
                         _bphrEntry.heartRate
                         )
+            _treatmentHome.logVitalTime()
         }
 
         onCloseClicked          : {
@@ -210,7 +204,7 @@
     Connections { target: _treatmentBloodPrime
         function onVisibleChanged                   ( vValue ) {
             if (_treatmentBloodPrime.visible) {
-                _treatmentMenu.hidden = true
+                _headerBar.menuHidden = true
             }
         }
     }