Index: leahi.pro
===================================================================
diff -u -rad57884fca3e8a0916b6d6bf51a69264b9b5263f -r6e41d2d9f431580bb350db71cc52dd40e60e1a28
--- leahi.pro	(.../leahi.pro)	(revision ad57884fca3e8a0916b6d6bf51a69264b9b5263f)
+++ leahi.pro	(.../leahi.pro)	(revision 6e41d2d9f431580bb350db71cc52dd40e60e1a28)
@@ -254,6 +254,7 @@
     sources/view/td/data/VTDTemperatureData.h \
     sources/view/td/data/VTDValvesData.h \
     sources/view/td/data/VTDVoltageData.h \
+    sources/view/td/data/VTreatmentRanges.h \
     \ # ---------- Views - TD - Data - In-Treatment
     sources/view/td/data/treatment/VTDTreatmentStatesData.h \
     sources/view/td/data/treatment/VTreatmentBloodFlow.h \
@@ -726,6 +727,7 @@
     sources/view/td/data/VTDTemperatureData.cpp \
     sources/view/td/data/VTDValvesData.cpp \
     sources/view/td/data/VTDVoltageData.cpp \
+    sources/view/td/data/VTreatmentRanges.cpp \
     \ # ---------- Views - TD - Data - In-Treatment
     sources/view/td/data/treatment/VTDTreatmentStatesData.cpp \
     sources/view/td/data/treatment/VTreatmentBloodFlow.cpp \
@@ -813,7 +815,6 @@
     sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.cpp \
     sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp \
     \ # ---------- Views - HD - Data - In-Treatment
-    sources/view/hd/data/VTreatmentRanges.cpp \
     sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp \
     sources/view/hd/data/treatment/VTreatmentHeparinData.cpp \
     \ # ---------- Views - HD - Data - End-Treatment
Index: leahi.qrc
===================================================================
diff -u -rad57884fca3e8a0916b6d6bf51a69264b9b5263f -r6e41d2d9f431580bb350db71cc52dd40e60e1a28
--- leahi.qrc	(.../leahi.qrc)	(revision ad57884fca3e8a0916b6d6bf51a69264b9b5263f)
+++ leahi.qrc	(.../leahi.qrc)	(revision 6e41d2d9f431580bb350db71cc52dd40e60e1a28)
@@ -26,7 +26,7 @@
         <file alias="SettingsDecommission.qml">sources/gui/qml/pages/settings/SettingsDecommission.qml</file>
         <file alias="SettingsInstitutionalRecord.qml">sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml</file>
         <file alias="SettingsLocalization.qml">sources/gui/qml/pages/settings/SettingsLocalization.qml</file>
-        <file alias="SettingsUserMode.qml">sources/gui/qml/pages/settings/SettingsUserMode.qml</file>
+        <file alias="SettingsAdvancedMode.qml">sources/gui/qml/pages/settings/SettingsAdvancedMode.qml</file>
         <file alias="SettingsFeatureConfigurations.qml">sources/gui/qml/pages/settings/SettingsFeatureConfigurations.qml</file>
         <file alias="SettingsAdvancedInstitutional.qml">sources/gui/qml/pages/settings/SettingsAdvancedInstitutional.qml</file>
     </qresource>
@@ -108,6 +108,7 @@
         <file alias="iVitalsRed">resources/images/Vitals_Red.png</file>
         <file alias="iCheckGreen">resources/images/check_green.png</file>
         <file alias="iEyeClosed">resources/images/eye_closed.png</file>
+        <file alias="iStepCheck">resources/images/stepCheck.png</file>
         <file alias="iCompleteCheck">resources/images/complete_check.png</file>
     </qresource>
     <qresource prefix="/components">
@@ -248,13 +249,11 @@
         <file alias="PreTreatmentStack.qml">sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml</file>
         <file alias="PreTreatmentWaterSampleStack.qml">sources/gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml</file>
         <file alias="PreTreatmentConsumablesStack.qml">sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml</file>
-        <file alias="PreTreatmentDisposablesStack.qml">sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml</file>
         <file alias="PreTreatmentPrimeStack.qml">sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml</file>
     </qresource>
     <qresource prefix="/pages/pretreatment/create">
         <file alias="PreTreatmentCreate.qml">sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml</file>
         <file alias="PreTreatmentCreateContent.qml">sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml</file>
-        <file alias="PreTreatmentCreateStack.qml">sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml</file>
     </qresource>
     <qresource prefix="/pages/pretreatment/connection">
         <file alias="PreTreatmentUltrafiltration.qml">sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml</file>
Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -rbd8d4a0e4e5a34b3187f4b472f1eb385d2a24046 -r6e41d2d9f431580bb350db71cc52dd40e60e1a28
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision bd8d4a0e4e5a34b3187f4b472f1eb385d2a24046)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 6e41d2d9f431580bb350db71cc52dd40e60e1a28)
@@ -83,10 +83,10 @@
 
             // POST
             ID_HDPostSingleResultData                   = 0x8E0F, // 142 //// ----- @CRAPIZED: had to change to avoid duplication
-            ID_HDPostFinalResultData                    = 0x8F00, // 143
+            ID_HDPostFinalResultData                    = 0x8F0F, // 143 //// ----- @CRAPIZED
             ID_DGPostSingleResultData                   = 0x900F, // 144 //// ----- @CRAPIZED: had to change to avoid duplication
             ID_DGPostFinalResultData                    = 0x910F, // 145 //// ----- @CRAPIZED: had to change to avoid duplication
-            ID_UIPostFinalResultData                    = 0x920F, // 146 // ID_UIFinalResultTxr - UI Final Result response/Data transmit
+            ID_UIPostFinalResultData                    = 0x920F, // 146 //// ----- @CRAPIZED: had to change to avoid duplication
             ID_UIPostFinalResultHDReq                   = 0xB200, // 178 // ID_HDFinalResultRxq - HD Final Result request       received
 
             // ----- Settings
@@ -138,7 +138,7 @@
             ID_Ultrafiltration                          = 0x3E00, // 62     //// ----- @LEAHIZED
             ID_Heparin                                  = 0x8C00, // 140
             ID_IsolatedUF                               = 0x9A00, // 154
-            ID_Rinseback                                = 0x5600, // 86
+            ID_Rinseback                                = 0x8F00, // 143    //// ----- @LEAHIZED
             ID_Recirculate                              = 0x5A00, // 90
             ID_BloodPrime                               = 0x5900, // 89
             ID_TreatmentStop                            = 0x4900, // 73
@@ -173,8 +173,8 @@
             // Pre-Treatment SelfTest NoCartridge Progress Data
             ID_SelfTestNoCartridgeData                  = 0x6100, // 97  // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
             // Pre-Treatment Disposables Installation Confirm
-            ID_AdjustDisposablesConfirmReq              = 0x6200, // 98  // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
-            ID_AdjustDisposablesConfirmRsp              = 0xAD00, // 173 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
+            ID_AdjustDisposablesConfirmReq              = 0x9200, // 146  // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
+            ID_AdjustDisposablesConfirmRsp              = 0x9300, // 147 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
             // Pre-Treatment SelfTest Dry Progress Data
             ID_SelfTestDryData                          = 0x630F, // 99     //// ----- @CRAPIZED: had to change to avoid duplication
             // Pre-Treatment Disposable Priming
@@ -294,8 +294,8 @@
 
             // End-Treatment
             // Rinseback
-            ID_AdjustRinsebackReq                       = 0x520F, // 82 //// ----- @CRAPIZED: had to change to avoid duplication
-            ID_AdjustRinsebackRsp                       = 0x530F, // 83 //// ----- @CRAPIZED: had to change to avoid duplication
+            ID_AdjustRinsebackReq                       = 0x9000, // 144  //// ----- @LEAHIZED
+            ID_AdjustRinsebackRsp                       = 0x9100, // 145  //// ----- @LEAHIZED
 
             // Recirculate
             ID_AdjustRecirculateReq                     = 0x540F, // 84 //// ----- @CRAPIZED: had to change to avoid duplication
@@ -312,8 +312,8 @@
             ID_AdjustPatientDisconnectConfirmRsp        = 0x7E0F, // 126    //// ----- @CRAPIZED: had to change to avoid duplication
 
             // Disposables Removal
-            ID_AdjustDisposablesRemovalConfirmReq       = 0x730F, // 115 //// ----- @CRAPIZED: had to change to avoid duplication
-            ID_AdjustDisposablesRemovalConfirmRsp       = 0x740F, // 116 //// ----- @CRAPIZED: had to change to avoid duplication
+            ID_AdjustDisposablesRemovalConfirmReq       = 0x9400, // 148
+            ID_AdjustDisposablesRemovalConfirmRsp       = 0x9500, // 149
 
             // Treatment Log Adjs
             ID_AdjustTreatmentLogReq                    = 0x750F, // 117 //// ----- @CRAPIZED: had to change to avoid duplication
Index: sources/gui/qml/globals/Fonts.qml
===================================================================
diff -u -r41ba9331e6a540df0c8eced0c4d3b8684afa9afa -r6e41d2d9f431580bb350db71cc52dd40e60e1a28
--- sources/gui/qml/globals/Fonts.qml	(.../Fonts.qml)	(revision 41ba9331e6a540df0c8eced0c4d3b8684afa9afa)
+++ sources/gui/qml/globals/Fonts.qml	(.../Fonts.qml)	(revision 6e41d2d9f431580bb350db71cc52dd40e60e1a28)
@@ -82,8 +82,8 @@
     readonly property int fontPixelUltrafiltrationAdjustmentMetrics         : 30
     readonly property int fontPixelUltrafiltrationAdjustmentNotification    : 32
     readonly property int fontPixelUltrafiltrationAdjustmentConfirmation    : 50
-    readonly property int fontPixelUltrafiltrationRangeMarker               : 32
-    readonly property int fontPixelUltrafiltrationMinMaxLabel               : 24
+    readonly property int fontPixelUltrafiltrationRangeMarker               : 24
+    readonly property int fontPixelUltrafiltrationMinMaxLabel               : 18
     readonly property int fontPixelUltrafiltrationRateUnit                  : 16
 
     readonly property int fontPixelRinsebackAdjustmentButton    : 26
Index: sources/gui/qml/globals/Variables.qml
===================================================================
diff -u -rad57884fca3e8a0916b6d6bf51a69264b9b5263f -r6e41d2d9f431580bb350db71cc52dd40e60e1a28
--- sources/gui/qml/globals/Variables.qml	(.../Variables.qml)	(revision ad57884fca3e8a0916b6d6bf51a69264b9b5263f)
+++ sources/gui/qml/globals/Variables.qml	(.../Variables.qml)	(revision 6e41d2d9f431580bb350db71cc52dd40e60e1a28)
@@ -42,6 +42,8 @@
     readonly property int mainMenuHeight                        : 80   //// ----- @LEAHIZED
     readonly property int alarmDialogHeaderHeight               : 100
 
+    readonly property int instructionHeight                     : 73
+
     readonly property int minVGap                               : 15
     readonly property int minVGap2                              : 30
 
Index: sources/view/td/data/VTreatmentRanges.cpp
===================================================================
diff -u -r32a7b4d52315019d125c6c7b728bf0d215919c0f -r6e41d2d9f431580bb350db71cc52dd40e60e1a28
--- sources/view/td/data/VTreatmentRanges.cpp	(.../VTreatmentRanges.cpp)	(revision 32a7b4d52315019d125c6c7b728bf0d215919c0f)
+++ sources/view/td/data/VTreatmentRanges.cpp	(.../VTreatmentRanges.cpp)	(revision 6e41d2d9f431580bb350db71cc52dd40e60e1a28)
@@ -324,5 +324,10 @@
     FROMVARIANT_WITHRETURN              ( chlorineWaterSampleCheckMax       , "Chlorine Water Sample Check"             , "Chlorine_Water_Sample_Check_Max"     , Int   , isConfigsOk );
     FROMVARIANT_WITHRETURN              ( chlorineWaterSampleCheckRes       , "Chlorine Water Sample Check"             , "Chlorine_Water_Sample_Check_Res"     , Int   , isConfigsOk );
 
+    FROMVARIANT_WITHRETURN              ( isolatedUFDurationDef             , "Isolated UF Duration Ranges"             , "Isolated_UF_Duration_Def"            , UInt  , isConfigsOk );
+    FROMVARIANT_WITHRETURN              ( isolatedUFDurationMin             , "Isolated UF Duration Ranges"             , "Isolated_UF_Duration_Min"            , UInt  , isConfigsOk );
+    FROMVARIANT_WITHRETURN              ( isolatedUFDurationMax             , "Isolated UF Duration Ranges"             , "Isolated_UF_Duration_Max"            , UInt  , isConfigsOk );
+    FROMVARIANT_WITHRETURN              ( isolatedUFDurationRes             , "Isolated UF Duration Ranges"             , "Isolated_UF_Duration_Res"            , UInt  , isConfigsOk );
+
     emit didTreatmentRangesDone( isConfigsOk );
 }
Index: sources/view/td/data/VTreatmentRanges.h
===================================================================
diff -u -r32a7b4d52315019d125c6c7b728bf0d215919c0f -r6e41d2d9f431580bb350db71cc52dd40e60e1a28
--- sources/view/td/data/VTreatmentRanges.h	(.../VTreatmentRanges.h)	(revision 32a7b4d52315019d125c6c7b728bf0d215919c0f)
+++ sources/view/td/data/VTreatmentRanges.h	(.../VTreatmentRanges.h)	(revision 6e41d2d9f431580bb350db71cc52dd40e60e1a28)
@@ -104,6 +104,9 @@
     // ultrafiltration
     RANGESET( float         , ultrafiltrationVolume                         , 0)
 
+    // isolated UF
+    RANGESET( quint32       , isolatedUFDuration                            , 0)
+
     VIEW_DEC_CLASS(VTreatmentRanges                 )
     VIEW_DEC_SLOT(TreatmentRangesData               )
     VIEW_DEC_SLOT(SettingsData                      )