Index: sources/gui/qml/main.qml
===================================================================
diff -u -r4e521c1a06ac5ba8fa125f9efba8a1b3c91c525a -rf1e0e3ab13b12c450d52668608c92b33aa1d2c91
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 4e521c1a06ac5ba8fa125f9efba8a1b3c91c525a)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision f1e0e3ab13b12c450d52668608c92b33aa1d2c91)
@@ -29,7 +29,6 @@
 import VHDAirBubble                                         0.1
 import VTDAirTrap                                           0.1
 import VTDVoltage                                           0.1
-import VTDBloodPump                                         0.1
 import VTDValves                                            0.1
 import VTDBattery                                           0.1
 import VTDSwitches                                          0.1
@@ -58,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
@@ -69,6 +68,7 @@
 import VTreatmentPressureOcclusion                          0.1
 import VTreatmentUltrafiltration                            0.1
 import VTreatmentTime                                       0.1
+import VTreatmentParametersSetPoint                         0.1
 import VTreatmentRinseback                                  0.1
 import VTreatmentRecirculate                                0.1
 import VTreatmentBloodPrime                                 0.1
@@ -100,7 +100,8 @@
 import VDGValvesStates                                      0.1
 import VTreatmentCreate                                     0.1
 import VDGAccelerometer                                     0.1
-import VDGConductivity                                      0.1
+import VDDConductivity                                      0.1
+import VDDGenDialysate                                      0.1
 // In-Treatment - Adjustemnt
 import VTreatmentAdjustmentDuration                         0.1
 import VTreatmentAdjustmentFlows                            0.1
@@ -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 ) {
@@ -192,7 +193,6 @@
     VHDBloodLeak                                        { id: vHDBloodLeak                                          }
     VTDAirTrap                                          { id: vTDAirTrap                                            }
     VTDVoltage                                          { id: vTDVoltage                                            }
-    VTDBloodPump                                        { id: vTDBloodPump                                          }
     VTDValves                                           { id: vTDValves                                             }
     VTDBattery                                          { id: vTDBattery                                            }
     VTDSwitches                                         { id: vTDSwitches                                           }
@@ -203,6 +203,7 @@
     VTreatmentPressureOcclusion                         { id: vTreatmentPressureOcclusion                           }
     VTreatmentUltrafiltration                           { id: vTreatmentUltrafiltration                             }
     VTreatmentTime                                      { id: vTreatmentTime                                        }
+    VTreatmentParametersSetPoint                        { id: vTreatmentParametersSetPoint                          }
     VTreatmentBloodPrime                                { id: vTreatmentBloodPrime                                  }
     VTreatmentRinseback                                 { id: vTreatmentRinseback                                   }
     VTreatmentRecirculate                               { id: vTreatmentRecirculate                                 }
@@ -218,7 +219,8 @@
     VDGTemperatures                                     { id: vDGTemperatures                                       }
     VDGValvesStates                                     { id: vDGValvesStates                                       }
     VDGAccelerometer                                    { id: vDGAccelerometer                                      }
-    VDGConductivity                                     { id: vDGConductivity                                       }
+    VDDConductivity                                     { id: vDDConductivity                                       }
+    VDDGenDialysate                                     { id: vDDGenDialysate                                       }
     // --- Pre-Treatment Progress Data
     VPreTreatmentAdjustmentInitTreatment                { id: vPreTreatmentAdjustmentInitTreatment                  }
     VDGFilterFlush                                      { id: vDGFilterFlush                                        }
@@ -264,7 +266,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
@@ -303,14 +305,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
@@ -468,6 +471,7 @@
         isSilenced          : _alarmItem.isSilenced
         timeout             : _alarmItem.timeout
         backgroundFading    : vTDOpMode.fault
+        z                   : 995
     }
 
     GuiView { id: _GuiView