Index: sources/gui/qml/main.qml
===================================================================
diff -u -re49c956894f999f6539b0c404dd1c9b18a76bb4b -r232dc65ad1d642f750547db6c480da534704a2c4
--- sources/gui/qml/main.qml	(.../main.qml)	(revision e49c956894f999f6539b0c404dd1c9b18a76bb4b)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 232dc65ad1d642f750547db6c480da534704a2c4)
@@ -203,7 +203,7 @@
     VTreatmentVitals                                    { id: vTreatmentVitals
         interval        : vTreatmentCreate.bloodPressureMeasureInterval
         canStartInterval: vTDOpMode.inTreatment && vTDTreatmentStates.txTreatment
-        enableBPCuff    : true  // TODO: PRS 343 update with enable/disable Integrated Blood Pressure Cuff
+        enableBPCuff    : vSettings.integratedBPCuff
         onCanStartIntervalChanged : {
             if ( vTreatmentVitals.canStartInterval )    { vTreatmentVitals.doTimerStart()   }
             else                                        { vTreatmentVitals.doTimerStop()    }
@@ -360,22 +360,24 @@
         //        }
     }
     // keyboard should always be before AlarmItem to not to covet it.
-    KeyboardItem                { id: _keyboard                    }
+    KeyboardItem                { id: _keyboard                     }
 
     // Dialogs
-    AcidConcentrateAdjustment   { id: _acidConcentrateAdjustment   }
-    HeaderbarPrescription       { id: _headerbarPrescription       }
-    HeaderbarWiFi               { id: _headerbarWifi               }
-    HeaderbarStorage            { id: _headerbarStorage            }
-    HeaderbarSettings           { id: _headerbarSettings           }
-    HeaderbarInformation        { id: _headerbarInformation        }
+    AcidConcentrateAdjustment   { id: _acidConcentrateAdjustment    }
+    HeaderbarPrescription       { id: _headerbarPrescription        }
+    HeaderbarWiFi               { id: _headerbarWifi                }
+    HeaderbarStorage            { id: _headerbarStorage             }
+    HeaderbarSettings           { id: _headerbarSettings            }
+    HeaderbarInformation        { id: _headerbarInformation         }
     TreatmentAdjustmentVitals   { id: _treatmentAdjustmentVitals    }
-    LockDialog                  { id: _lockDialog                  }
-    AlarmItem                   { id: _alarmItem        ;   z: 996 }
-    PowerItem                   { id: _powerItem        ;   z: 997 }
-    ConfirmDialog               { id: _confirmDialog    ;   z: 998 }
-    DiagnosticsDialog           { id: _diagnosticsDialog;   z: 999 }
+    EndTreatmentDialog          { id: _endTreatmentDialog           }
 
+    LockDialog                  { id: _lockDialog                   }
+    AlarmItem                   { id: _alarmItem        ;   z: 996  }
+    PowerItem                   { id: _powerItem        ;   z: 997  }
+    ConfirmDialog               { id: _confirmDialog    ;   z: 998  }
+    DiagnosticsDialog           { id: _diagnosticsDialog;   z: 999  }
+
     // Note: NotificationBar has to be anchored to the main menu and if it is moved into the AlarmItem
     //       then cannot be anchored.
     NotificationBar     { id: _alarmBar