Index: sources/gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml
===================================================================
diff -u -rbd01334f257c35b96b7b232beacbcd7fae60c852 -r8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608
--- sources/gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml	(.../PreTreatmentWaterSampleStack.qml)	(revision bd01334f257c35b96b7b232beacbcd7fae60c852)
+++ sources/gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml	(.../PreTreatmentWaterSampleStack.qml)	(revision 8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608)
@@ -36,7 +36,7 @@
     signal sampleReleased()
     signal passClicked   ()
     signal failClicked   ()
-    signal endTreatmentClicked
+    signal okClicked     ()
 
     // ----- Screens definitions
     PreTreatmentBase { id: _preTreatmentFilterFlush
@@ -94,33 +94,32 @@
         footer.children: [
             TouchRect {
                 width: parent.spacing
-                text.text: qsTr("END  TREATMENT")
-                onClicked: _root.endTreatmentClicked()
+                text.text: qsTr("OK")
+                onClicked: _root.okClicked()
             }
         ]
     }
 
     // ----- Screens Navigations
     Connections { target: vPreTreatmentStates
-        onWaterSample_setupChanged  : { if ( vwaterSample_setup     ) { page( _preTreatmentFilterFlush               )}}
-        onWaterSample_runningChanged: { if ( vwaterSample_running   ) { page( _preTreatmentWaterSample               )}}
+        onWaterSample_setupChanged  : { page( _preTreatmentFilterFlush      , vwaterSample_setup    )}
+        onWaterSample_runningChanged: { page( _preTreatmentWaterSample      , vwaterSample_running  )}
     }
 
     // ----- Screen Actions/Navigations
     Connections { target: _preTreatmentWaterSample
-        onConfirmClicked            : {                                 page( _preTreatmentWaterSampleResult           )}
+        onConfirmClicked            : { page( _preTreatmentWaterSampleResult                        )}
     }
 
     Connections { target: _preTreatmentWaterSampleResult
-        onBackClicked               : {                                 page( _preTreatmentWaterSample                 )}
+        onBackClicked               : { page( _preTreatmentWaterSample                              )}
     }
 
-    onSamplePressed                 : { vPreTreatmentAdjustmentWaterSample.doSample( true  )}
-    onSampleReleased                : { vPreTreatmentAdjustmentWaterSample.doSample( false )}
-    onPassClicked                   : { vPreTreatmentAdjustmentWaterSample.doResult( true  )}
-    onFailClicked                   : { vPreTreatmentAdjustmentWaterSample.doResult( false )
-                                                                        page( _preTreatmentWaterSampleResultFail       )}
-    onEndTreatmentClicked           : {                                                                                 }
+    onSamplePressed                 : { vPreTreatmentAdjustmentWaterSample.doSample( true           )}
+    onSampleReleased                : { vPreTreatmentAdjustmentWaterSample.doSample( false          )}
+    onPassClicked                   : { vPreTreatmentAdjustmentWaterSample.doResult( true           )}
+    onFailClicked                   : { page( _preTreatmentWaterSampleResultFail                    )}
+    onOkClicked                     : { vPreTreatmentAdjustmentWaterSample.doResult( false          )}
 
     Connections { target: vPreTreatmentAdjustmentWaterSample
         onAdjustmentTriggered   : {