Index: sources/gui/qml/pages/disinfect/DisinfectStack.qml
===================================================================
diff -u -r615da996f40180040439b2a2fba22e8f24920336 -rf0cbe4cfc8a5e6e7aa58a8eeaab2d838cf2ff957
--- sources/gui/qml/pages/disinfect/DisinfectStack.qml	(.../DisinfectStack.qml)	(revision 615da996f40180040439b2a2fba22e8f24920336)
+++ sources/gui/qml/pages/disinfect/DisinfectStack.qml	(.../DisinfectStack.qml)	(revision f0cbe4cfc8a5e6e7aa58a8eeaab2d838cf2ff957)
@@ -78,15 +78,12 @@
         objectName              : "_disinfectFlush"
         header.stepNames        : [ _root.disinfectTitle ,  _root.flushTitle ]
         title.text              :                           _root.flushTitle
-        hasTimeCircle           : true
-        timeCircleMinimum       : 0
-        timeCircleMaximum       : vDisinfectDGData.flushTimeTotal
-        timeCircleProgressValue : vDisinfectDGData.flushTimeElapsed
-        timeCircleTimeTextValue : vDisinfectDGData.flushTimeRemaining * 60
 
         hasCheckList            : true
         isComplete              : vDisinfectStates.flushComplete
         completeText            : qsTr("Water Flush Complete!")
+        checkListTimeVisible    : vDisinfectDGData.flushTimeTotal
+        checkListTimeSeconds    : vDisinfectDGData.flushTimeRemaining
         checkListStepNames      : [
             qsTr("Drain Device"         ),
             qsTr("Flush Reservoirs"     ),
@@ -99,15 +96,12 @@
         objectName              : "_disinfectHeat"
         header.stepNames        : [ _root.disinfectTitle ,  _root.heatTitle ]
         title.text              :                           _root.heatTitle
-        hasTimeCircle           : false
-        timeCircleMinimum       : 0
-        timeCircleMaximum       : vDisinfectDGData.heatTimeTotal
-        timeCircleProgressValue : vDisinfectDGData.heatTimeElapsed
-        timeCircleTimeTextValue : vDisinfectDGData.heatTimeRemaining * 60
 
         hasCheckList            : true
         isComplete              : vDisinfectStates.heatComplete
         completeText            : qsTr("Heat Disinfection Complete!")
+        checkListTimeVisible    : vDisinfectDGData.heatTimeTotal
+        checkListTimeSeconds    : vDisinfectDGData.heatTimeRemaining
         checkListStepNames      : [
             qsTr("Flush Before Disinfect"   ),
             qsTr("Heat Up Water"            ),
@@ -132,15 +126,12 @@
         objectName              : "_disinfectChemicalProgress"
         header.stepNames        : [ _root.disinfectTitle ,  _root.chemicalTitle ]
         title.text              :                           _root.chemicalTitle
-        hasTimeCircle           : true
-        timeCircleMinimum       : 0
-        timeCircleMaximum       : vDisinfectDGData.chemicalTimeTotal
-        timeCircleProgressValue : vDisinfectDGData.chemicalTimeElapsed
-        timeCircleTimeTextValue : vDisinfectDGData.chemicalTimeRemaining * 60
 
         hasCheckList            : true
         isComplete              : vDisinfectStates.chemicalComplete
         completeText            : qsTr("Chemical Disinfection Complete!")
+        checkListTimeVisible    : vDisinfectDGData.chemicalTimeTotal
+        checkListTimeSeconds    : vDisinfectDGData.chemicalTimeRemaining
         checkListStepNames      : [
             qsTr("Flush Before Disinfect"   ),
             qsTr("Mix water And Acid"       ),