Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -rb2db816026524a19086e900eef867d7f5a3aa6f2 -r83acad721bd36d2c88a15feddd6812d2e591bef3
--- sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision b2db816026524a19086e900eef867d7f5a3aa6f2)
+++ sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 83acad721bd36d2c88a15feddd6812d2e591bef3)
@@ -221,8 +221,8 @@
     {Gui::GuiActionType::ID_AdjustInitTreatmentReq                  ,   1 * 4       }, // 1 parameters each 4bytes
     {Gui::GuiActionType::ID_AdjustInitTreatmentRsp                  ,   2 * 4       }, // 2 parameters each 4bytes
     // Pre-Treatment Treatment Parameters Validation/Confirm
-    {Gui::GuiActionType::ID_AdjustParametersValidationReq           ,  24 * 4       }, //23 parameters each 4bytes
-    {Gui::GuiActionType::ID_AdjustParametersValidationRsp           ,  25 * 4       }, //24 parameters each 4bytes
+    {Gui::GuiActionType::ID_AdjustParametersValidationReq           ,  24 * 4       }, //24 parameters each 4bytes
+    {Gui::GuiActionType::ID_AdjustParametersValidationRsp           ,  25 * 4       }, //25 parameters each 4bytes
     {Gui::GuiActionType::ID_AdjustParametersConfirmReq              ,   1 * 4       }, // 1 parameters each 4bytes
     // Pre-Treatment Water Sample
     {Gui::GuiActionType::ID_DGFilterFlushData                       ,   2 * 4       }, // 2 parameters each 4bytes
Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsSwipe.qml
===================================================================
diff -u -r56381aae237db191956aff493907cd1f0801216b -r83acad721bd36d2c88a15feddd6812d2e591bef3
--- sources/gui/qml/dialogs/diagnostics/DiagnosticsSwipe.qml	(.../DiagnosticsSwipe.qml)	(revision 56381aae237db191956aff493907cd1f0801216b)
+++ sources/gui/qml/dialogs/diagnostics/DiagnosticsSwipe.qml	(.../DiagnosticsSwipe.qml)	(revision 83acad721bd36d2c88a15feddd6812d2e591bef3)
@@ -24,7 +24,7 @@
  * \brief   the pre treatment prime stack screen
  */
 Item { id: _root
-    SwipeView { id: view
+    SwipeView { id: _view
         currentIndex: 0
         anchors.fill: parent
 
Index: sources/gui/qml/dialogs/headerbar/HeaderbarPrescription.qml
===================================================================
diff -u -r82b22f0f0ae1ff5b0a5c1524c7e91cc8d667b180 -r83acad721bd36d2c88a15feddd6812d2e591bef3
--- sources/gui/qml/dialogs/headerbar/HeaderbarPrescription.qml	(.../HeaderbarPrescription.qml)	(revision 82b22f0f0ae1ff5b0a5c1524c7e91cc8d667b180)
+++ sources/gui/qml/dialogs/headerbar/HeaderbarPrescription.qml	(.../HeaderbarPrescription.qml)	(revision 83acad721bd36d2c88a15feddd6812d2e591bef3)
@@ -71,9 +71,7 @@
             rightMargin     : Variables.defaultMargin * 3
         }
         enabled     : _root.isFirstTab ? true : _headerbarPrescriptionContent.confirmReady()
-        text.text   : _root.isFirstTab ? qsTr("Next") :
-                                         vTreatmentCreate.parametersValidated ? qsTr("Confirm") :
-                                                                                qsTr("Validate")
+        text.text   : _root.isFirstTab ? qsTr("Next") : qsTr("Validate")
         visible     : ! vTDOpMode.inTreatment && ! vTreatmentCreate.parametersValidated
 
         onClicked   : {
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
===================================================================
diff -u -rfb3c31821213807fb8d0e40f4840181f370c23e4 -r83acad721bd36d2c88a15feddd6812d2e591bef3
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision fb3c31821213807fb8d0e40f4840181f370c23e4)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision 83acad721bd36d2c88a15feddd6812d2e591bef3)
@@ -33,9 +33,8 @@
 
     function clear( vValue )        { if ( ! vValue ) return;  _preTreatmentCreateContent.clear()                                                               }
     function confirmReady()         { return _root.isFirstTab ? true : _preTreatmentCreateContent.confirmReady()                                                }
-    function confirmButtonClicked() { if ( _root.isFirstTab ) { _preTreatmentCreateContent.currentIndex = PreTreatmentCreateContent.TreatmentSettings; return;  }
-                                      if (vTreatmentCreate.parametersValidated) { _preTreatmentCreateContent.confirm()                                          }
-                                      else                                      { _preTreatmentCreateContent.validate()                                         }}
+    function confirmButtonClicked() { if ( _root.isFirstTab )   { _preTreatmentCreateContent.currentIndex = PreTreatmentCreateContent.TreatmentSettings         }
+                                      else                      { _preTreatmentCreateContent.validate()                                                         }}
     function back()                 { _preTreatmentCreateContent.currentIndex = PreTreatmentCreateContent.PatientPrescription                                   }
 
     PreTreatmentCreateContent { id: _preTreatmentCreateContent