Index: sources/gui/qml/main.qml
===================================================================
diff -u -r601289deb20f7059b3af5bb19e16f53974262ceb -rc9764bd0ad823c5c1725d7c7f556290c2c459d4d
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 601289deb20f7059b3af5bb19e16f53974262ceb)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision c9764bd0ad823c5c1725d7c7f556290c2c459d4d)
@@ -54,7 +54,10 @@
 import VDuetRoWaterDG                                       0.1
 import VCloudSync                                           0.1
 import VHDUsageInfo                                         0.1
+import VInstitutionalRecord                                 0.1
 import VAdjustmentInstitutionalRecord                       0.1
+import VAdvancedInstitutionalRecord                         0.1
+import VAdjustmentAdvancedInstitutionalRecord               0.1
 // States views
 import VTDOpMode                                            0.1 //// ----- @LEAHIZED
 import VPreTreatmentStates                                  0.1
@@ -76,6 +79,8 @@
 import VTreatmentSaline                                     0.1
 import VTreatmentStop                                       0.1
 import VTreatmentRanges                                     0.1
+import VTreatmentHeparin                                    0.1
+
 // Pre-Treatment
 import VPreTreatmentAdjustmentInitTreatment                 0.1
 import VDGFilterFlush                                       0.1
@@ -109,7 +114,6 @@
 import VDDLevel                                             0.1
 import VDDBloodLeak                                         0.1
 // FP Data
-import VFPValvesStates                                      0.1
 import VFPROPump                                            0.1
 import VFPPressures                                         0.1
 import VFPLevel                                             0.1
@@ -182,6 +186,9 @@
     VCloudSync                                          { id: vCloudSync                                            }
     VHDUsageInfo                                        { id: vHDUsageInfo                                          }
     VAdjustmentInstitutionalRecord                      { id: vAdjustmentInstitutionalRecord                        }
+    VInstitutionalRecord                                { id: vInstitutionalRecord                                  }
+    VAdjustmentAdvancedInstitutionalRecord              { id: vAdjustmentAdvancedInstitutionalRecord                }
+    VAdvancedInstitutionalRecord                        { id: vAdvancedInstitutionalRecord                          }
     //VAdjustIn
     // ---- States
     VTDOpMode                                    { id: vTDOpMode
@@ -202,7 +209,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()    }
@@ -233,6 +240,8 @@
     VTreatmentRinseback                                 { id: vTreatmentRinseback                                   }
     VTreatmentRecirculate                               { id: vTreatmentRecirculate                                 }
     VTreatmentStop                                      { id: vTreatmentStop                                        }
+    VTreatmentHeparin                                   { id: vTreatmentHeparin                                     }
+
     // ---- DD
     VDGDrainPump                                        { id: vDGDrainPump                                          }
     VDDHeaters                                          { id: vDDHeaters                                            }
@@ -251,7 +260,6 @@
     VDDLevel                                            { id: vDDLevel                                              }
     VDDBloodLeak                                        { id: vDDBloodLeak                                          }
     // --- FP Data
-    VFPValvesStates                                     { id: vFPValvesStates                                       }
     VFPROPump                                           { id: vFPROPump                                             }
     VFPPressures                                        { id: vFPPressures                                          }
     VFPLevel                                            { id: vFPLevel                                              }
@@ -364,22 +372,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