Index: leahi.qrc
===================================================================
diff -u -r128121958d87699685bd88261e39bb968a0de204 -r2f76603ecaceffc19181bffbf811cae2966d7593
--- leahi.qrc	(.../leahi.qrc)	(revision 128121958d87699685bd88261e39bb968a0de204)
+++ leahi.qrc	(.../leahi.qrc)	(revision 2f76603ecaceffc19181bffbf811cae2966d7593)
@@ -34,6 +34,7 @@
         <file alias="NotificationDialog.qml">sources/gui/qml/dialogs/NotificationDialog.qml</file>
         <file alias="AlarmListDialog.qml">sources/gui/qml/dialogs/AlarmListDialog.qml</file>
         <file alias="LockDialog.qml">sources/gui/qml/dialogs/LockDialog.qml</file>
+        <file alias="AcidConcentrateAdjustment.qml">sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml</file>
     </qresource>
     <qresource prefix="/dialogs/diagnostics">
         <file alias="DiagnosticsDialog.qml">sources/gui/qml/dialogs/diagnostics/DiagnosticsDialog.qml</file>
@@ -100,6 +101,9 @@
         <file alias="iInformation">resources/images/Information.png</file>
         <file alias="iStorage">resources/images/Storage.png</file>
         <file alias="iHelp">resources/images/help.png</file>
+        <file alias="iMenuDot">resources/images/Menu_Dot.png</file>
+        <file alias="iArrowLeftDisabled">resources/images/ArrowLeftDisabled.png</file>
+        <file alias="iArrowRightDisabled">resources/images/ArrowRightDisabled.png</file>
     </qresource>
     <qresource prefix="/components">
         <file alias="MainMenu.qml">sources/gui/qml/components/MainMenu.qml</file>
@@ -129,10 +133,6 @@
         <file alias="TimeText.qml">sources/gui/qml/components/TimeText.qml</file>
         <file alias="ProgressCircle.qml">sources/gui/qml/components/ProgressCircle.qml</file>
         <file alias="Slider.qml">sources/gui/qml/components/Slider.qml</file>
-        <file alias="SliderCreateTreatment.qml">sources/gui/qml/components/SliderCreateTreatment.qml</file>
-        <file alias="ConfirmTreatmentTable.qml">sources/gui/qml/components/ConfirmTreatmentTable.qml</file>
-        <file alias="ConfirmTreatmentSubTable.qml">sources/gui/qml/components/ConfirmTreatmentSubTable.qml</file>
-        <file alias="GridSelection.qml">sources/gui/qml/components/GridSelection.qml</file>
         <file alias="ProgressBarEx.qml">sources/gui/qml/components/ProgressBarEx.qml</file>
         <file alias="CloseButton.qml">sources/gui/qml/components/CloseButton.qml</file>
         <file alias="ConfirmButton.qml">sources/gui/qml/components/ConfirmButton.qml</file>
@@ -143,7 +143,6 @@
         <file alias="ImageWave.qml">sources/gui/qml/components/ImageWave.qml</file>
         <file alias="ImageClock.qml">sources/gui/qml/components/ImageClock.qml</file>
         <file alias="ImageLogoDDarkTransparent.qml">sources/gui/qml/components/ImageLogoDDarkTransparent.qml</file>
-        <file alias="ConfirmTreatmentTableEntry.qml">sources/gui/qml/components/ConfirmTreatmentTableEntry.qml</file>
         <file alias="DebugDataColumn.qml">sources/gui/qml/components/DebugDataColumn.qml</file>
         <file alias="RangeSlider.qml">sources/gui/qml/components/RangeSlider.qml</file>
         <file alias="MuteButton.qml">sources/gui/qml/components/MuteButton.qml</file>
@@ -165,6 +164,7 @@
         <file alias="HeaderBar.qml">sources/gui/qml/components/HeaderBar.qml</file>
         <file alias="HeaderBarPopup.qml">sources/gui/qml/components/HeaderBarPopup.qml</file>
         <file alias="AlarmButtonRow.qml">sources/gui/qml/components/AlarmButtonRow.qml</file>
+        <file alias="BaseComboBox.qml">sources/gui/qml/components/BaseComboBox.qml</file>
     </qresource>
     <qresource prefix="/compounds">
         <file alias="PressureRangeSlider.qml">sources/gui/qml/compounds/PressureRangeSlider.qml</file>
@@ -173,6 +173,8 @@
         <file alias="CheckListView.qml">sources/gui/qml/compounds/CheckListView.qml</file>
         <file alias="TouchGrid.qml">sources/gui/qml/compounds/TouchGrid.qml</file>
         <file alias="BPHREntry.qml">sources/gui/qml/compounds/BPHREntry.qml</file>
+        <file alias="LabelUnitContainer.qml">sources/gui/qml/compounds/LabelUnitContainer.qml</file>
+        <file alias="ValueAdjuster.qml">sources/gui/qml/compounds/ValueAdjuster.qml</file>
     </qresource>
     <qresource prefix="/">
         <file>qtquickcontrols2.conf</file>
@@ -235,9 +237,9 @@
         <file alias="PreTreatmentPrimeStack.qml">sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml</file>
     </qresource>
     <qresource prefix="/pages/pretreatment/create">
-        <file alias="PreTreatmentCreateStack.qml">sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml</file>
         <file alias="PreTreatmentCreate.qml">sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml</file>
-        <file alias="PreTreatmentConfirm.qml">sources/gui/qml/pages/pretreatment/create/PreTreatmentConfirm.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/qml/main.qml
===================================================================
diff -u -r128121958d87699685bd88261e39bb968a0de204 -r2f76603ecaceffc19181bffbf811cae2966d7593
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 128121958d87699685bd88261e39bb968a0de204)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 2f76603ecaceffc19181bffbf811cae2966d7593)
@@ -179,6 +179,7 @@
         onStandbyChanged: {
             if(vTDOpMode.standby) {
                 vTreatmentVitals.doReset()
+                vTreatmentCreate.txCode = ""
             }
         }
     }
@@ -348,17 +349,18 @@
         //        }
     }
     // keyboard should always be before AlarmItem to not to covet it.
-    KeyboardItem            { id: _keyboard                    }
+    KeyboardItem                { id: _keyboard                    }
 
-    HeaderbarWiFi           { id: _headerbarWifi               }
-    HeaderbarStorage        { id: _headerbarStorage            }
-    HeaderbarSettings       { id: _headerbarSettings           }
-    HeaderbarInformation    { id: _headerbarInformation        }
-    LockDialog              { id: _lockDialog                  }
-    AlarmItem               { id: _alarmItem        ;   z: 996 }
-    PowerItem               { id: _powerItem        ;   z: 997 }
-    ConfirmDialog           { id: _confirmDialog    ;   z: 998 }
-    DiagnosticsDialog       { id: _diagnosticsDialog;   z: 999 }
+    // Dialogs
+    AcidConcentrateAdjustment   { id: _acidConcentrateAdjustment   }
+    HeaderbarWiFi               { id: _headerbarWifi               }
+    HeaderbarStorage            { id: _headerbarStorage            }
+    HeaderbarSettings           { id: _headerbarSettings           }
+    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.