Index: sources/gui/qml/dialogs/watersample/WaterSampleDialog.qml
===================================================================
diff -u -re34703a10dcb558f13948e7d0ac4994f07270239 -r0bb5f08eb3570de6bff3ce67ca502db129b59096
--- sources/gui/qml/dialogs/watersample/WaterSampleDialog.qml	(.../WaterSampleDialog.qml)	(revision e34703a10dcb558f13948e7d0ac4994f07270239)
+++ sources/gui/qml/dialogs/watersample/WaterSampleDialog.qml	(.../WaterSampleDialog.qml)	(revision 0bb5f08eb3570de6bff3ce67ca502db129b59096)
@@ -26,13 +26,22 @@
     height          : Variables.dialogHeight
     clip            : true
 
+    readonly property bool timeout: vWaterSample.timeout
+
+    onTimeoutChanged: {
+        if ( _root.timeout ) {
+            _menu.index = WaterSampleDialog.WaterSample
+            _root.open()
+        }
+    }
+
     enum Page {
         WaterSample     ,
         Dialysate
     }
 
-    WaterSamplePage             { id: _waterSample;         visible : _menu.index === WaterSampleDialog.WaterSample;    }
-    WaterSampleDialysatePage    { id: _dialysateChecks;     visible : _menu.index === WaterSampleDialog.Dialysate;      }
+    WaterSamplePage             { id: _waterSample;         visible : vSettings.roWaterMode ? _menu.index === WaterSampleDialog.WaterSample : false ;   }
+    WaterSampleDialysatePage    { id: _dialysateChecks;     visible : vSettings.roWaterMode ? _menu.index === WaterSampleDialog.Dialysate   : true  ;   }
 
     MainMenu { id: _menu
         anchors {
@@ -43,13 +52,10 @@
         width               : _root.width / 2.5
         color               : Colors.transparent
         titlePixelSize      : 30
-        model               : _model
-
-        ListModel { id: _model
-            ListElement {   text: qsTr("Water Sample")          ; visible: true   }
-            ListElement {   text: qsTr("Dialysate Checks")      ; visible: true   }
-        }
+        model               : vWaterSampleModel.model
+        index               : 0
     }
+
     Line {
         anchors {
             bottom          : _menu.bottom
@@ -62,6 +68,9 @@
     }
 
     CloseButton { id : _closeButton
+
+        visible:  vSettings.roWaterMode ? _waterSample.isPrimary: true
+
         onClicked : {
             _root.close()
         }