Index: sources/gui/qml/main.qml
===================================================================
diff -u -r0470ff6f209ff0c5089f8f0849b6da04f60f8f41 -rbe1b2d8f110b741f3d630df438da07d411110543
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 0470ff6f209ff0c5089f8f0849b6da04f60f8f41)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision be1b2d8f110b741f3d630df438da07d411110543)
@@ -6,8 +6,8 @@
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
  * \file main.qml
- * \author (last) Behrouz NematiPour
- * \date (last) 25-Aug-2020
+ * \author (last) Peter Lucia
+ * \date (last) 15-Oct-2020
  * \author (original) Behrouz NematiPour
  * \date (original) 24-Sep-2019
  *
@@ -34,9 +34,6 @@
 
 import VTreatmentAdjustmentDuration                 0.1;
 import VTreatmentAdjustmentFlows                    0.1;
-import VTreatmentAdjustmentUltrafiltrationState     0.1;
-import VTreatmentAdjustmentUltrafiltrationEdit      0.1;
-import VTreatmentAdjustmentUltrafiltrationConfirm   0.1;
 
 import VTreatmentCreate                             0.1;
 import VBluetooth                                   0.1;
@@ -51,6 +48,7 @@
 import VDGValvesStates                              0.1;
 import VPriming                                     0.1;
 import VTreatmentBegin                              0.1;
+import VTreatmentEnd                                0.1;
 
 //  Qml imports
 import "qrc:/globals"
@@ -105,13 +103,11 @@
 
     VTreatmentAdjustmentDuration                { id: vTreatmentAdjustmentDuration                  }
     VTreatmentAdjustmentFlows                   { id: vTreatmentAdjustmentFlows                     }
-    VTreatmentAdjustmentUltrafiltrationState    { id: vTreatmentAdjustmentUltrafiltrationState      }
-    VTreatmentAdjustmentUltrafiltrationEdit     { id: vTreatmentAdjustmentUltrafiltrationEdit       }
-    VTreatmentAdjustmentUltrafiltrationConfirm  { id: vTreatmentAdjustmentUltrafiltrationConfirm    }
     VTreatmentCreate                            { id: vTreatmentCreate                              }
     VBluetooth                                  { id: vBluetooth                                    }
     VPriming                                    { id: vPriming                                      }
     VTreatmentBegin                             { id: vTreatmentBegin                               }
+    VTreatmentEnd                               { id: vTreatmentEnd                                 }
 
     // ----- Follow the below Z order -----
     // 1 - Screens
@@ -156,22 +152,23 @@
 
         onClickedNotificationBar: {
             updateAlarm();
+            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
@@ -180,13 +177,13 @@
         onClickedOkay: {
             _alarm_dialog.visible = false;
             _alarm_bar.visible = true;
-            vAlarmStatus.requestOkay(alarmID)
+            vAlarmStatus.onRequestOkay(alarmID)
         }
 
         onClickedSilence: {
             _alarm_dialog.visible = false;
             _alarm_bar.visible = true;
-            vAlarmStatus.requestSilence();
+            vAlarmStatus.onRequestSilence();
         }
     }
 
@@ -195,7 +192,7 @@
         color: Colors.textMain
         anchors {
             right: parent.right
-            margins: 10
+            margins: 5
             bottom: parent.bottom
         }
         horizontalAlignment: Text.AlignRight
@@ -294,17 +291,13 @@
     Connections { target: vAlarmStatus
         onRaiseAlarm: {
             updateAlarm();
-            _alarm_dialog.isSilenced = vAlarmStatus.alarm_Flag_alarmsSilenced
-            _alarm_bar.toggleSilence(vAlarmStatus.alarm_Flag_alarmsSilenced,
-                                            vAlarmStatus.alarm_MuteTimeout);
 
-            if (isAlarmHighPriority()) {
+            if (vAlarmStatus.minimizeAlarm) {
+                _alarm_dialog.visible = false;
+                _alarm_bar.visible = true;
+            } else {
                 _alarm_dialog.visible = true;
                 _alarm_bar.visible = false;
-            } else {
-                if (!_alarm_dialog.visible) {
-                    _alarm_bar.visible = true;
-                }
             }
         }