Index: sources/gui/qml/components/HeaderBar.qml
===================================================================
diff -u -r0dfba44fb7172b9458d161b3ed5f54527f93b698 -r89be2d248cac3f748b704cd62408cf8911991039
--- sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision 0dfba44fb7172b9458d161b3ed5f54527f93b698)
+++ sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision 89be2d248cac3f748b704cd62408cf8911991039)
@@ -26,16 +26,26 @@
     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
+
+        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
             }
         }
     }
@@ -141,25 +151,25 @@
             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       ||
-                              vTDOpMode.validateParameters
+                              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
+                              vTDOpMode.postTreatment       ||
+                              vTDOpMode.validateParameters
 
-            onPressed       : _headerbarPrescription.open()
+            onPressed       : _treatmentAdjustmentVitals.open()
         }
 
         IconButton { id  : _wifiButton
@@ -170,23 +180,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"