Index: sources/gui/qml/main.qml
===================================================================
diff -u -r53491f18249d31cec365d69e37355ceb61131e56 -r77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 53491f18249d31cec365d69e37355ceb61131e56)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8)
@@ -304,14 +304,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
@@ -469,6 +470,7 @@
         isSilenced          : _alarmItem.isSilenced
         timeout             : _alarmItem.timeout
         backgroundFading    : vTDOpMode.fault
+        z                   : 995
     }
 
     GuiView { id: _GuiView