Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8 -rf8e37a0cbb537edceebee7a7c5f2676f497d1e26
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8)
+++ 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,23 +59,16 @@
                                          || _treatmentAdjustmentPressuresLimits .visible
                                          || _treatmentAdjustmentDuration        .visible
                                          || _treatmentUltrafiltrationItem       .visible
-    // Components
-    MainMenu            { id: _treatmentMenu
-        position        : MainMenu.Position.Top
-        hidden          : true
-        titles          : [ qsTr("Treatment")   ,   qsTr("Trends")  ,   qsTr("Heparin")]
-        visibleItems    : [       true          ,   false           ,   false  ]
-        spacing         :  Variables.defaultMargin
-        leftPdding      :  Variables.headerBarDateTimeWidth + Variables.columnSpacing // 200 + 60
-        partitionWidth  : 80 * titles.length// Todo Important : max width should be the width for all bottons
-        titlePixelSize  : 32
 
-        onCurrentIndexChanged: {
-            if (currentIndex === 1)     push(_treatmentTrends)
-            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                }
@@ -207,7 +204,7 @@
     Connections { target: _treatmentBloodPrime
         function onVisibleChanged                   ( vValue ) {
             if (_treatmentBloodPrime.visible) {
-                _treatmentMenu.hidden = true
+                _headerBar.menuHidden = true
             }
         }
     }