Index: sources/gui/qml/components/HeaderBar.qml
===================================================================
diff -u -rd9993ef9458e1c25abc86a63d4d10b666ff8cd2c -rf0e262920199d1d5ebdbe3f1bf0c58c58a82d363
--- sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision d9993ef9458e1c25abc86a63d4d10b666ff8cd2c)
+++ sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision f0e262920199d1d5ebdbe3f1bf0c58c58a82d363)
@@ -26,17 +26,28 @@
 
     MouseArea { id: _mouseArea
         anchors.fill    : parent
-        // TODO: disable this later. this is only for diagnostic purpose.
-        onDoubleClicked : {
-            if ( _GuiView.dryDemoMode ) {
-                let dryDemoTempID = 99
-                let id = vConfirm.id
-                vConfirm.id = dryDemoTempID
-                vConfirm.doConfirm( true  )
-                vConfirm.id = id
+        property real lastClickTime: 0
+        property int doubleClickThreshold: 500 // ms
+
+        // had to implement my own double click because the onDoubleClicked was not user friednly for touch.
+        // a 500 ms threshold between clicks has bee added
+        onClicked : {
+            const now = Date.now()
+            if (now - _mouseArea.lastClickTime < _mouseArea.doubleClickThreshold) {
+                if ( _GuiView.dryDemoMode ) {
+                    let dryDemoTempID = 99
+                    let id = vConfirm.id
+                    vConfirm.id = dryDemoTempID
+                    vConfirm.doConfirm( true  )
+                    vConfirm.id = id
+                }
+                else {
+                    _diagnosticsDialog.open()
+                }
+                lastClickTime = 0
             }
             else {
-                _diagnosticsDialog.open()
+                lastClickTime = now
             }
         }
     }
@@ -126,8 +137,16 @@
         titlePixelSize  : 32
         backgroundColor : Colors.transparent
         highlightHeight : 15
+        model           : _model
         isMainTreatment : true
         onHiddenChanged: { if (hidden) { index = 0 } }
+
+        ListModel { id: _model
+            ListElement {   text: qsTr("Treatment");    visible: true;      screen:  0      }   // MainMenu.Treatment
+            ListElement {   text: qsTr("Trends");       visible: true;      screen:  1      }   // MainMenu.Trends
+            ListElement {   text: qsTr("Heparin");      visible: true;      screen:  2      }   // MainMenu.Heparin
+            ListElement {   text: qsTr("HDF");          visible: false;     screen:  3      }   // MainMenu.HDF
+        }
     }
 
     Row { id: _headerButtonRow
@@ -146,24 +165,24 @@
             onPressed       : _endTreatmentDialog.open()
         }
 
-        VitalsButton { id  : _vitalsButton
+        IconButton { id  : _prescriptionButton
+            iconSize        : Variables.headerIconDiameter
+            iconImageSource : "qrc:/images/iPrescription"
             extraSpace      : _headerButtonRow.spacing
             visible         : vTDOpMode.preTreatment        ||
                               vTDOpMode.inTreatment         ||
                               vTDOpMode.postTreatment
 
-            onPressed       : _treatmentAdjustmentVitals.open()
+            onPressed       : _headerbarPrescription.open()
         }
 
-        IconButton { id  : _prescriptionButton
-            iconSize        : Variables.headerIconDiameter
-            iconImageSource : "qrc:/images/iPrescription"
+        VitalsButton { id  : _vitalsButton
             extraSpace      : _headerButtonRow.spacing
             visible         :( vTDOpMode.preTreatment        ||
                                vTDOpMode.inTreatment         ||
                                vTDOpMode.postTreatment ) && ! _root.isCreateRx
 
-            onPressed       : _headerbarPrescription.open()
+            onPressed       : _treatmentAdjustmentVitals.open()
         }
 
         IconButton { id  : _wifiButton
@@ -174,23 +193,16 @@
             onPressed       : _headerbarWifi.openDialog(_wifiButton)
         }
 
-        IconButton { id  : _cloudSyncButton
-            iconSize        : Variables.headerIconDiameter
-            iconImageSource : "qrc:/images/iCloudSync"
-            extraSpace      : _headerButtonRow.spacing
-            enabled         : false
+        // TODO Phase 2 👋👋👋
+//        IconButton { id  : _cloudSyncButton
+//            iconSize        : Variables.headerIconDiameter
+//            iconImageSource : "qrc:/images/iCloudSync"
+//            extraSpace      : _headerButtonRow.spacing
+//            enabled         : false
 
-            onPressed       : print("CloudSync button pressed!")
-        }
+//            onPressed       : print("CloudSync button pressed!")
+//        }
 
-        IconButton { id  : _storageButton
-            iconSize        : Variables.headerIconDiameter
-            iconImageSource : "qrc:/images/iStorage"
-            extraSpace      : _headerButtonRow.spacing
-
-            onPressed       : _headerbarStorage.openDialog(_storageButton)
-        }
-
         IconButton { id  : _settingsButton
             iconSize        : Variables.headerIconDiameter
             iconImageSource : "qrc:/images/iSettings"
Index: sources/gui/qml/main.qml
===================================================================
diff -u -rd9993ef9458e1c25abc86a63d4d10b666ff8cd2c -rf0e262920199d1d5ebdbe3f1bf0c58c58a82d363
--- sources/gui/qml/main.qml	(.../main.qml)	(revision d9993ef9458e1c25abc86a63d4d10b666ff8cd2c)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision f0e262920199d1d5ebdbe3f1bf0c58c58a82d363)
@@ -351,7 +351,7 @@
         disable                 : _GuiView.manufactSetup || _GuiView.updateSetup
         hidden                  : true // it should be hidden by default since the landing screen changed to init and it does not have the main menu until the POST passes.
         width                   : Variables.applicationWidth
-        isMainMenu              : true
+        model                   : _model
 
         Component.onCompleted   : {
             _settingsStack.visible = false
@@ -365,6 +365,12 @@
             _managerStack .visible = vIndex === 1
             _settingsStack.visible = vIndex === 2
         }
+
+        ListModel { id: _model
+            ListElement {   text: qsTr("Treatment")     ; visible: true   }
+            ListElement {   text: qsTr("Prescriptions") ; visible: true   }
+            ListElement {   text: qsTr("Settings")      ; visible: true   }
+        }
     }
 
     Connections { target: vTDOpMode
@@ -392,7 +398,6 @@
     AcidConcentrateAdjustment   { id: _acidConcentrateAdjustment    }
     HeaderbarPrescription       { id: _headerbarPrescription        }
     HeaderbarWiFi               { id: _headerbarWifi                }
-    HeaderbarStorage            { id: _headerbarStorage             }
     HeaderbarSettings           { id: _headerbarSettings            }
     HeaderbarInformation        { id: _headerbarInformation         }
     TreatmentAdjustmentVitals   { id: _treatmentAdjustmentVitals    }