Index: sources/gui/qml/main.qml
===================================================================
diff -u -r4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac -r53134008481fd775533e8988b7436f2f75e47336
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 53134008481fd775533e8988b7436f2f75e47336)
@@ -38,7 +38,7 @@
 import VTreatmentAdjustmentUltrafiltrationEdit      0.1;
 import VTreatmentAdjustmentUltrafiltrationConfirm   0.1;
 
-import VCreateTreatment                             0.1;
+import VTreatmentCreate                             0.1;
 import VDGDrainPump                                 0.1;
 import VDGHeaters                                   0.1;
 import VDGLoadCellReadings                          0.1;
@@ -48,6 +48,9 @@
 import VDGReservoir                                 0.1;
 import VDGTemperatures                              0.1;
 import VDGValvesStates                              0.1;
+import VPriming                                     0.1;
+import VTreatmentBegin                              0.1;
+import VTreatmentEnd                                0.1;
 
 //  Qml imports
 import "qrc:/globals"
@@ -81,28 +84,7 @@
 
     // TODO : When Testing data on Setting screen is removed
     //        This needs to be moved into the Treatment______.qml
-    VAlarmStatus { id: vAlarmStatus
-        onRaiseAlarm: {
-            updateAlarm();
-            _alarm_dialog.isSilenced = vAlarmStatus.alarm_Flag_alarmsSilenced
-            _alarm_bar.toggleSilence(vAlarmStatus.alarm_Flag_alarmsSilenced,
-                                            vAlarmStatus.alarm_MuteTimeout);
-            if (isAlarmHighPriority()) {
-                _alarm_dialog.visible = true;
-                _alarm_bar.visible = false;
-            } else {
-                if (!_alarm_dialog.visible) {
-                    _alarm_bar.visible = true;
-                }
-            }
-        }
-
-        onHideAlarm: {
-            _alarm_bar.visible = false;
-            _alarm_dialog.visible = false;
-        }
-    }
-
+    VAlarmStatus                                { id: vAlarmStatus                                  }
     VPowerOff                                   { id: vPowerOff                                     }
     VHDOperationMode                            { id: vHDOperationMode                              }
     VTreatmentBloodFlow                         { id: vTreatmentBloodFlow                           }
@@ -126,7 +108,10 @@
     VTreatmentAdjustmentUltrafiltrationState    { id: vTreatmentAdjustmentUltrafiltrationState      }
     VTreatmentAdjustmentUltrafiltrationEdit     { id: vTreatmentAdjustmentUltrafiltrationEdit       }
     VTreatmentAdjustmentUltrafiltrationConfirm  { id: vTreatmentAdjustmentUltrafiltrationConfirm    }
-    VCreateTreatment                            { id: vCreateTreatment                              }
+    VTreatmentCreate                            { id: vTreatmentCreate                              }
+    VPriming                                    { id: vPriming                                      }
+    VTreatmentBegin                             { id: vTreatmentBegin                               }
+    VTreatmentEnd                               { id: vTreatmentEnd                                 }
 
     // ----- Follow the below Z order -----
     // 1 - Screens
@@ -171,43 +156,38 @@
 
         onClickedNotificationBar: {
             updateAlarm();
-            _alarm_bar.setFlashing(false);
+            vAlarmStatus.onSetMinimize(false);
             _alarm_bar.visible = false;
             _alarm_dialog.visible = true;
         }
     }
 
-    function isAlarmHighPriority() {
-        return vAlarmStatus.alarm_Priority === GuiActions.ALARM_PRIORITY_HIGH;
-    }
-
     function updateAlarm() {
         _alarm_dialog.titleText = "Alarm";
         _alarm_dialog.description = vAlarmStatus.text;
         _alarm_dialog.alarmID = vAlarmStatus.alarm_AlarmID;
         [_alarm_dialog.backgroundColor, _alarm_dialog.textColor] = getRootTextFromAlarmLevel(vAlarmStatus.alarm_Priority);
         [_alarm_dialog.titleBarBackground, _alarm_dialog.titleBarForeground] = getAlarmTopBarColors(vAlarmStatus.alarm_Priority);
         _alarm_bar.backgroundColor = _alarm_dialog.titleBarBackground;
+
+        _alarm_dialog.isSilenced = vAlarmStatus.alarm_Flag_alarmsSilenced;
+        _alarm_bar.toggleSilence(vAlarmStatus.alarm_Flag_alarmsSilenced, vAlarmStatus.alarm_MuteTimeout);
+        _alarm_dialog.silenceBtn.visible = !vAlarmStatus.alarm_Flag_alarmsSilenced;
     }
 
     NotificationDialog { id: _alarm_dialog
         alarmID: -1
-        onClosed: {
-            _alarm_bar.visible = true;
-        }
+
         onClickedOkay: {
             _alarm_dialog.visible = false;
-            vAlarmStatus.requestOkay(alarmID)
-            if (isAlarmHighPriority()) {
-                _alarm_bar.setFlashing(true);
-                return;
-            }
-            _alarm_bar.setFlashing(false);
+            _alarm_bar.visible = true;
+            vAlarmStatus.onRequestOkay(alarmID)
         }
 
         onClickedSilence: {
             _alarm_dialog.visible = false;
-            vAlarmStatus.requestSilence();
+            _alarm_bar.visible = true;
+            vAlarmStatus.onRequestSilence();
         }
     }
 
@@ -311,4 +291,23 @@
             }
         }
     }
+
+    Connections { target: vAlarmStatus
+        onRaiseAlarm: {
+            updateAlarm();
+
+            if (vAlarmStatus.minimizeAlarm) {
+                _alarm_dialog.visible = false;
+                _alarm_bar.visible = true;
+            } else {
+                _alarm_dialog.visible = true;
+                _alarm_bar.visible = false;
+            }
+        }
+
+        onNoAlarm: {
+            _alarm_bar.visible = false;
+            _alarm_dialog.visible = false;
+        }
+    }
 }