Index: sources/gui/qml/main.qml
===================================================================
diff -u -r4fb6a5fb521604e29160115ff3b4b0623301e663 -rf1e0e3ab13b12c450d52668608c92b33aa1d2c91
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 4fb6a5fb521604e29160115ff3b4b0623301e663)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision f1e0e3ab13b12c450d52668608c92b33aa1d2c91)
@@ -57,7 +57,7 @@
 // States views
 import VTDOpMode                                            0.1 //// ----- @LEAHIZED
 import VPreTreatmentStates                                  0.1
-import VHDTreatmentStates                                   0.1
+import VTDTreatmentStates                                   0.1
 import VPostTreatmentStates                                 0.1
 
 // Treatment - Common
@@ -68,7 +68,7 @@
 import VTreatmentPressureOcclusion                          0.1
 import VTreatmentUltrafiltration                            0.1
 import VTreatmentTime                                       0.1
-import VTreatmentSetPoint                                   0.1
+import VTreatmentParametersSetPoint                         0.1
 import VTreatmentRinseback                                  0.1
 import VTreatmentRecirculate                                0.1
 import VTreatmentBloodPrime                                 0.1
@@ -131,6 +131,7 @@
 import "qrc:/pages/settings"
 import "qrc:/components"
 import "qrc:/dialogs"
+import "qrc:/dialogs/diagnostics"
 
 /*!
  * \brief   Initialization and start point of the QML
@@ -167,13 +168,13 @@
         }
     }
     VPreTreatmentStates                                 { id: vPreTreatmentStates                                   }
-    VHDTreatmentStates                                  { id: vHDTreatmentStates                                    }
+    VTDTreatmentStates                                  { id: vTDTreatmentStates                                    }
     VPostTreatmentStates                                { id: vPostTreatmentStates                                  }
 
     VTreatmentBloodFlow                                 { id: vTreatmentBloodFlow                                   }
     VTreatmentVitals                                    { id: vTreatmentVitals
         interval    : vTreatmentCreate.bloodPressureMeasureInterval
-        enableDialog:  vTDOpMode.inTreatment && vHDTreatmentStates.txTreatment
+        enableDialog:  vTDOpMode.inTreatment && vTDTreatmentStates.txTreatment
         // As long as UI is in In-Tx BP/HR is updated and the dialog will pop up on interval.
         onEnableDialogChanged : {
             if ( vTreatmentVitals.enableDialog ) {
@@ -202,7 +203,7 @@
     VTreatmentPressureOcclusion                         { id: vTreatmentPressureOcclusion                           }
     VTreatmentUltrafiltration                           { id: vTreatmentUltrafiltration                             }
     VTreatmentTime                                      { id: vTreatmentTime                                        }
-    VTreatmentSetPoint                                  { id: vTreatmentSetPoint                                    }
+    VTreatmentParametersSetPoint                        { id: vTreatmentParametersSetPoint                          }
     VTreatmentBloodPrime                                { id: vTreatmentBloodPrime                                  }
     VTreatmentRinseback                                 { id: vTreatmentRinseback                                   }
     VTreatmentRecirculate                               { id: vTreatmentRecirculate                                 }
@@ -265,9 +266,7 @@
     // ----- Follow the below Z order -----
     // 1 - Screens
     // 1 - 1
-    SettingsStack { id: _settingsStack 
-        anchors.top : _headerBar.bottom
-    }
+    SettingsStack { id: _settingsStack } // FIXME: BEHROUZ - anchors.top : _headerbar.bottom or add topMargin to all stacks
     // 1 - 2
     ManagerStack  { id: _managerStack  }
     // 1 - 3
@@ -303,18 +302,18 @@
 
     // 9 - Others
     Rectangle { //TODO:@LEAHI: make this the statusbar/headerbar component.
-        id: _headerBar 
         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
@@ -472,6 +471,7 @@
         isSilenced          : _alarmItem.isSilenced
         timeout             : _alarmItem.timeout
         backgroundFading    : vTDOpMode.fault
+        z                   : 995
     }
 
     GuiView { id: _GuiView