Index: sources/gui/qml/main.qml
===================================================================
diff -u -rf0c8b8720a2e314268445a4a20fe701292026f6f -rd70b0372a4457f36abedd3034f237d6e0cafa111
--- sources/gui/qml/main.qml	(.../main.qml)	(revision f0c8b8720a2e314268445a4a20fe701292026f6f)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision d70b0372a4457f36abedd3034f237d6e0cafa111)
@@ -263,7 +263,7 @@
     // ----- Follow the below Z order -----
     // 1 - Screens
     // 1 - 1
-    SettingsStack { id: _settingsStack } // FIXME: BEHROUZ - anchors.top : _headerbar.bottom or add topMargin to all stacks
+    SettingsStack { id: _settingsStack }
     // 1 - 2
     ManagerStack  { id: _managerStack  }
     // 1 - 3
@@ -302,14 +302,15 @@
         anchors.top: parent.top
         width   : Variables.applicationWidth
         height  : Variables.notificationHeight
-        color   : Colors.backgroundMainMenu
+        color   : _mainStack.currentScreen.objectName === 'TreatmentStack' ? "transparent" :    // FIXME: BEHROUZ - My workaround for showing the top main treatment menu with headerbar
+                                                                       Colors.backgroundMainMenu
         gradient: Gradient { //TODO:@LEAHI: make this a component.
             GradientStop { position: 0.2; color: Qt.lighter(Colors.backgroundMain, 1.2) }
             GradientStop { position: 0.8; color: Qt.darker (Colors.backgroundMain, 1.2) }
         }
 
         Item {
-            width   : 200
+            width   : Variables.headerBarDateTimeWidth
             anchors {
                 top     : parent.top
                 left    : parent.left
@@ -467,6 +468,7 @@
         isSilenced          : _alarmItem.isSilenced
         timeout             : _alarmItem.timeout
         backgroundFading    : vTDOpMode.fault
+        z                   : 995
     }
 
     GuiView { id: _GuiView