Index: sources/gui/qml/main.qml
===================================================================
diff -u -r77e7c1e746bba703ab3aee61f8e19f398fd9ac00 -rd9993ef9458e1c25abc86a63d4d10b666ff8cd2c
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 77e7c1e746bba703ab3aee61f8e19f398fd9ac00)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision d9993ef9458e1c25abc86a63d4d10b666ff8cd2c)
@@ -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
@@ -66,13 +69,15 @@
 // In-Treatment - Data
 import VTreatmentBloodFlow                                  0.1
 import VTreatmentDialysateFlow                              0.1
+import VTreatmentIsolatedUF                                 0.1
 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
+import VTreatmentSaline                                     0.1
 import VTreatmentStop                                       0.1
 import VTreatmentRanges                                     0.1
 import VTreatmentHeparin                                    0.1
@@ -110,7 +115,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
@@ -119,8 +123,18 @@
 import VFPTemperature                                       0.1
 import VFPBoostPump                                         0.1
 // In-Treatment - Adjustemnt
-import VTreatmentAdjustmentDuration                         0.1
+import VTreatmentAdjustmentBloodPrime                       0.1
+import VTreatmentAdjustmentBolusVolume                      0.1
+import VTreatmentAdjustmentDurationEdit                     0.1
+import VTreatmentAdjustmentDurationConfirm                  0.1
+import VTreatmentAdjustmentSetPoints                        0.1
+import VTreatmentAdjustmentBloodFlowRate                    0.1
+import VTreatmentAdjustmentDialysateFlowRate                0.1
+import VTreatmentAdjustmentDialysateTemperature             0.1
 import VTreatmentAdjustmentFlows                            0.1
+import VTreatmentAdjustmentIsolatedUFDurationEdit           0.1
+import VTreatmentAdjustmentIsolatedUFVolumeEdit             0.1
+import VTreatmentAdjustmentIsolatedUFConfirm                0.1
 import VTreatmentAdjustmentUltrafiltrationState             0.1
 import VTreatmentAdjustmentUltrafiltrationEdit              0.1
 import VTreatmentAdjustmentUltrafiltrationConfirm           0.1
@@ -177,6 +191,9 @@
     VCloudSync                                          { id: vCloudSync                                            }
     VHDUsageInfo                                        { id: vHDUsageInfo                                          }
     VAdjustmentInstitutionalRecord                      { id: vAdjustmentInstitutionalRecord                        }
+    VInstitutionalRecord                                { id: vInstitutionalRecord                                  }
+    VAdjustmentAdvancedInstitutionalRecord              { id: vAdjustmentAdvancedInstitutionalRecord                }
+    VAdvancedInstitutionalRecord                        { id: vAdvancedInstitutionalRecord                          }
     //VAdjustIn
     // ---- States
     VTDOpMode                                    { id: vTDOpMode
@@ -219,11 +236,13 @@
     VTDTemperature                                      { id: vTDTemperature                                        }
 
     VTreatmentDialysateFlow                             { id: vTreatmentDialysateFlow                               }
+    VTreatmentIsolatedUF                                { id: vTreatmentIsolatedUF                                  }
     VTreatmentPressureOcclusion                         { id: vTreatmentPressureOcclusion                           }
     VTreatmentUltrafiltration                           { id: vTreatmentUltrafiltration                             }
     VTreatmentTime                                      { id: vTreatmentTime                                        }
     VTreatmentParametersSetPoint                        { id: vTreatmentParametersSetPoint                          }
     VTreatmentBloodPrime                                { id: vTreatmentBloodPrime                                  }
+    VTreatmentSaline                                    { id: vTreatmentSaline                                      }
     VTreatmentRinseback                                 { id: vTreatmentRinseback                                   }
     VTreatmentRecirculate                               { id: vTreatmentRecirculate                                 }
     VTreatmentStop                                      { id: vTreatmentStop                                        }
@@ -247,7 +266,6 @@
     VDDLevel                                            { id: vDDLevel                                              }
     VDDBloodLeak                                        { id: vDDBloodLeak                                          }
     // --- FP Data
-    VFPValvesStates                                     { id: vFPValvesStates                                       }
     VFPROPump                                           { id: vFPROPump                                             }
     VFPPressures                                        { id: vFPPressures                                          }
     VFPLevel                                            { id: vFPLevel                                              }
@@ -271,11 +289,21 @@
     VPreTreatmentAdjustmentStartTreatment               { id: vPreTreatmentAdjustmentStartTreatment                 }
 
     // ---
-    VTreatmentAdjustmentDuration                        { id: vTreatmentAdjustmentDuration                          }
+    VTreatmentAdjustmentDurationEdit                    { id: vTreatmentAdjustmentDurationEdit                      }
+    VTreatmentAdjustmentDurationConfirm                 { id: vTreatmentAdjustmentDurationConfirm                   }
+    VTreatmentAdjustmentSetPoints                       { id: vTreatmentAdjustmentSetPoints                         }
+    VTreatmentAdjustmentBloodFlowRate                   { id: vTreatmentAdjustmentBloodFlowRate                     }
+    VTreatmentAdjustmentDialysateFlowRate               { id: vTreatmentAdjustmentDialysateFlowRate                 }
+    VTreatmentAdjustmentDialysateTemperature            { id: vTreatmentAdjustmentDialysateTemperature              }
     VTreatmentAdjustmentFlows                           { id: vTreatmentAdjustmentFlows                             }
     VTreatmentCreate                                    { id: vTreatmentCreate                                      }
 
     VTreatmentRanges                                    { id: vTreatmentRanges                                      }
+    VTreatmentAdjustmentBloodPrime                      { id: vTreatmentAdjustmentBloodPrime                        }
+    VTreatmentAdjustmentBolusVolume                     { id: vTreatmentAdjustmentBolusVolume                       }
+    VTreatmentAdjustmentIsolatedUFDurationEdit          { id: vTreatmentAdjustmentIsolatedUFDurationEdit            }
+    VTreatmentAdjustmentIsolatedUFVolumeEdit            { id: vTreatmentAdjustmentIsolatedUFVolumeEdit              }
+    VTreatmentAdjustmentIsolatedUFConfirm               { id: vTreatmentAdjustmentIsolatedUFConfirm                 }
     VTreatmentAdjustmentSaline                          { id: vTreatmentAdjustmentSaline                            }
     VTreatmentAdjustmentVitals                          { id: vTreatmentAdjustmentVitals                            }
     VTreatmentAdjustmentUltrafiltrationState            { id: vTreatmentAdjustmentUltrafiltrationState              }
@@ -343,6 +371,10 @@
         function onStandbyWaitDisinfectChanged  ( vValue ) { _mainMenu.isTreatment() }
     }
 
+    Connections { target: _mainStack
+        function onIsCreateRx  ( vState ) { _headerBar.isCreateRx = vState }
+    }
+
     // 9 - Others
     HeaderBar { id: _headerBar
         anchors.top: parent.top
@@ -354,22 +386,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