Index: sources/gui/qml/dialogs/watersample/WaterSampleDialog.qml
===================================================================
diff -u -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -r5a0639ee020873025a536140b8c6b5507d173412
--- sources/gui/qml/dialogs/watersample/WaterSampleDialog.qml	(.../WaterSampleDialog.qml)	(revision b110ee732fe1306669f71d9c17ed4714e1f03ee2)
+++ sources/gui/qml/dialogs/watersample/WaterSampleDialog.qml	(.../WaterSampleDialog.qml)	(revision 5a0639ee020873025a536140b8c6b5507d173412)
@@ -26,11 +26,11 @@
     height          : Variables.dialogHeight
     clip            : true
 
-    readonly property bool timeout: vWaterSample.timeout
+    readonly property bool timeout      : vWaterSample.timeout
 
     onTimeoutChanged: {
         if ( _root.timeout ) {
-            _menu.index = WaterSampleDialog.WaterSample
+            _menu.index =  _WaterSampleDialog.WaterSample
             _root.open()
         }
     }
@@ -40,8 +40,8 @@
         Dialysate
     }
 
-    WaterSamplePage             { id: _waterSample;         visible : vRoWaterMode.status ? _menu.index === WaterSampleDialog.WaterSample : false ;   }
-    WaterSampleDialysatePage    { id: _dialysateChecks;     visible : vRoWaterMode.status ? _menu.index === WaterSampleDialog.Dialysate   : true  ;   }
+    WaterSamplePage             { id: _waterSample;         visible : vWaterSampleModel.isROFeatured ? _menu.index === WaterSampleDialog.WaterSample : false ;   }
+    WaterSampleDialysatePage    { id: _dialysateChecks;     visible : vWaterSampleModel.isROFeatured ? _menu.index === WaterSampleDialog.Dialysate   : true  ;   }
 
     MainMenu { id: _menu
         anchors {
@@ -69,7 +69,7 @@
 
     CloseButton { id : _closeButton
 
-        visible:  vRoWaterMode.status ? _waterSample.isPrimary : true
+        visible:  vWaterSampleModel.isROFeatured ? _waterSample.isPrimary : true
 
         onClicked : {
             _root.close()