Index: sources/gui/qml/pages/disinfect/DisinfectStack.qml
===================================================================
diff -u -r6d4b788c840eeccb9ff603ce3195fd037fca7ede -ra9e71bdcefc289e2488368f47b1ba4795cd9e878
--- sources/gui/qml/pages/disinfect/DisinfectStack.qml	(.../DisinfectStack.qml)	(revision 6d4b788c840eeccb9ff603ce3195fd037fca7ede)
+++ sources/gui/qml/pages/disinfect/DisinfectStack.qml	(.../DisinfectStack.qml)	(revision a9e71bdcefc289e2488368f47b1ba4795cd9e878)
@@ -53,62 +53,20 @@
         else                                                { vPage.reasonText = vDisinfectAdjustDisinfect.text()  }
     }
 
-    function disinfectsCalls(vIndex) {
-        let functionArray
-        if ( vAdjustmentInstitutionalRecord.enableChemicalDisinfect ) {
-            functionArray = [
-                    doDisinfectFlush     ,
-                    doDisinfectHeat      ,
-                    doDisinfectChemical  ,
-                    doDisinfectChemFlush ,
-                    doDisinfectROPermeate,
-                    ]
-        }
-        else {
-            functionArray = [
-                    doDisinfectFlush     ,
-                    doDisinfectHeat      ,
-                    doDisinfectROPermeate,
-                   ]
-        }
-
-        functionArray[vIndex]()
-    }
-
-    function disinfectsTexts() {
-        if ( vAdjustmentInstitutionalRecord.enableChemicalDisinfect ) {
-            return [
-                    _root.flushTitle     ,
-                    _root.heatTitle      ,
-                    _root.chemicalTitle  ,
-                    _root.chemFlushTitle ,
-                    _root.roPermeateTitle,
-                    ]
-        }
-        else {
-            return [
-                    _root.flushTitle     ,
-                    _root.heatTitle      ,
-                    _root.roPermeateTitle,
-                   ]
-        }
-    }
-
     DisinfectBase { id          :  _disinfectHome
         objectName              : "_disinfectHome"
         property int stackStepIndex : 0
         header.stepNames        : [ _root.disinfectTitle ]
         title.text              :   _root.disinfectTitle
 
         TouchGrid {
-            width       : parent.width / 2
-            colCount    : 1
-            colSpacing  : 0
-            // rowCount    : itemsText
-            itemsText   : disinfectsTexts()
-            onItemClicked: {
-                disinfectsCalls(vIndex)
-            }
+            property bool isVisible: vAdjustmentInstitutionalRecord.enableChemicalDisinfect
+            width           : parent.width / 2
+            colCount        : 1
+            colSpacing      : 0
+            itemsText       : [ _root.flushTitle    , _root.heatTitle   , _root.chemicalTitle   , _root.chemFlushTitle  , _root.roPermeateTitle ,   ]
+            itemsVisible    : [ true                , true              , isVisible             , isVisible             , true                  ,   ]
+            onItemClicked   : [ doDisinfectFlush    , doDisinfectHeat   , doDisinfectChemical   , doDisinfectChemFlush  , doDisinfectROPermeate ,   ][vIndex]()
         }
         Image { id: _denaliDeviceImage
             anchors.right           : parent.right