Index: sources/gui/qml/main.qml
===================================================================
diff -u -r43ae56f762e6f3e1416d39e3d16f9103fc597e41 -r3c07dc803109f716937b692cb4a67a5324bb9ca3
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 43ae56f762e6f3e1416d39e3d16f9103fc597e41)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 3c07dc803109f716937b692cb4a67a5324bb9ca3)
@@ -26,7 +26,8 @@
 import VHDAccelerometer                                     0.1
 import VHDSyringePump                                       0.1
 import VHDBloodLeak                                         0.1
-import VHDAirBubble                                         0.1
+import VTDAirBubble                                         0.1
+import VTDAirPump                                           0.1
 import VTDAirTrap                                           0.1
 import VTDVoltage                                           0.1
 import VTDValves                                            0.1
@@ -68,7 +69,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
@@ -90,18 +91,22 @@
 import VPreTreatmentAdjustmentStartTreatment                0.1
 // ---
 import VDGDrainPump                                         0.1
-import VDGHeaters                                           0.1
+import VDDHeaters                                           0.1
 import VDGLoadCellReadings                                  0.1
 import VDGOperationMode                                     0.1
-import VDGPressures                                         0.1
+import VDDPressures                                         0.1
 import VDGROPump                                            0.1
 import VDGReservoir                                         0.1
-import VDGTemperatures                                      0.1
-import VDGValvesStates                                      0.1
+import VDDConcentratePump                                   0.1
+import VDDTemperatures                                      0.1
+import VDDDialysatePump                                     0.1
+import VDDValvesStates                                      0.1
 import VTreatmentCreate                                     0.1
 import VDGAccelerometer                                     0.1
 import VDDConductivity                                      0.1
 import VDDGenDialysate                                      0.1
+import VDDLevel                                             0.1
+import VDDBloodLeak                                         0.1
 // In-Treatment - Adjustemnt
 import VTreatmentAdjustmentDuration                         0.1
 import VTreatmentAdjustmentFlows                            0.1
@@ -131,6 +136,7 @@
 import "qrc:/pages/settings"
 import "qrc:/components"
 import "qrc:/dialogs"
+import "qrc:/dialogs/diagnostics"
 
 /*!
  * \brief   Initialization and start point of the QML
@@ -188,7 +194,8 @@
     VGeneralEvent                                       { id: vGeneralEvent                                         }
     VHDAccelerometer                                    { id: vHDAccelerometer                                      }
     VHDSyringePump                                      { id: vHDSyringePump                                        }
-    VHDAirBubble                                        { id: vHDAirBubble                                          }
+    VTDAirBubble                                        { id: vTDAirBubble                                          }
+    VTDAirPump                                          { id: vTDAirPump                                            }
     VHDBloodLeak                                        { id: vHDBloodLeak                                          }
     VTDAirTrap                                          { id: vTDAirTrap                                            }
     VTDVoltage                                          { id: vTDVoltage                                            }
@@ -202,24 +209,28 @@
     VTreatmentPressureOcclusion                         { id: vTreatmentPressureOcclusion                           }
     VTreatmentUltrafiltration                           { id: vTreatmentUltrafiltration                             }
     VTreatmentTime                                      { id: vTreatmentTime                                        }
-    VTreatmentSetPoint                                  { id: vTreatmentSetPoint                                    }
+    VTreatmentParametersSetPoint                        { id: vTreatmentParametersSetPoint                          }
     VTreatmentBloodPrime                                { id: vTreatmentBloodPrime                                  }
     VTreatmentRinseback                                 { id: vTreatmentRinseback                                   }
     VTreatmentRecirculate                               { id: vTreatmentRecirculate                                 }
     VTreatmentStop                                      { id: vTreatmentStop                                        }
     // ---- DG
     VDGDrainPump                                        { id: vDGDrainPump                                          }
-    VDGHeaters                                          { id: vDGHeaters                                            }
+    VDDHeaters                                          { id: vDDHeaters                                            }
     VDGLoadCellReadings                                 { id: vDGLoadCellReadings                                   }
     VDGOperationMode                                    { id: vDGOperationMode                                      }
-    VDGPressures                                        { id: vDGPressures                                          }
+    VDDPressures                                        { id: vDDPressures                                          }
     VDGROPump                                           { id: vDGROPump                                             }
     VDGReservoir                                        { id: vDGReservoir                                          }
-    VDGTemperatures                                     { id: vDGTemperatures                                       }
-    VDGValvesStates                                     { id: vDGValvesStates                                       }
+    VDDConcentratePump                                  { id: vDDConcentratePump                                    }
+    VDDTemperatures                                     { id: vDDTemperatures                                       }
+    VDDDialysatePump                                    { id: vDDDialysatePump                                      }
+    VDDValvesStates                                     { id: vDDValvesStates                                       }
     VDGAccelerometer                                    { id: vDGAccelerometer                                      }
     VDDConductivity                                     { id: vDDConductivity                                       }
     VDDGenDialysate                                     { id: vDDGenDialysate                                       }
+    VDDLevel                                            { id: vDDLevel                                              }
+    VDDBloodLeak                                        { id: vDDBloodLeak                                          }
     // --- Pre-Treatment Progress Data
     VPreTreatmentAdjustmentInitTreatment                { id: vPreTreatmentAdjustmentInitTreatment                  }
     VDGFilterFlush                                      { id: vDGFilterFlush                                        }
@@ -265,7 +276,7 @@
     // ----- Follow the below Z order -----
     // 1 - Screens
     // 1 - 1
-    SettingsStack { id: _settingsStack }
+    SettingsStack { id: _settingsStack } // FIXME: BEHROUZ - anchors.top : _headerbar.bottom or add topMargin to all stacks
     // 1 - 2
     ManagerStack  { id: _managerStack  }
     // 1 - 3
@@ -304,14 +315,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.1) }
-            GradientStop { position: 0.8; color: Qt.darker (Colors.backgroundMain, 1.1) }
+            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 +481,7 @@
         isSilenced          : _alarmItem.isSilenced
         timeout             : _alarmItem.timeout
         backgroundFading    : vTDOpMode.fault
+        z                   : 995
     }
 
     GuiView { id: _GuiView