Index: denali.qrc
===================================================================
diff -u -r22bd5aba8d60c1cfda0e0b3bdcb0f54cdc27dafb -rdb2238dcf17941be6a3c587b55a3ef06b94cee96
--- denali.qrc	(.../denali.qrc)	(revision 22bd5aba8d60c1cfda0e0b3bdcb0f54cdc27dafb)
+++ denali.qrc	(.../denali.qrc)	(revision db2238dcf17941be6a3c587b55a3ef06b94cee96)
@@ -93,19 +93,19 @@
         <file alias="ImageWave.qml">sources/gui/qml/components/ImageWave.qml</file>
         <file alias="ImageClock.qml">sources/gui/qml/components/ImageClock.qml</file>
         <file alias="ImageLogoDDT.qml">sources/gui/qml/components/ImageLogoDDarkTransparent.qml</file>
-        <file alias="PrimingTimer.qml">sources/gui/qml/components/PrimingTimer.qml</file>
         <file alias="ConfirmTreatmentTableEntry.qml">sources/gui/qml/components/ConfirmTreatmentTableEntry.qml</file>
         <file alias="DebugDataColumn.qml">sources/gui/qml/components/DebugDataColumn.qml</file>
-        <file alias="CheckListItem.qml">sources/gui/qml/components/CheckListItem.qml</file>
         <file alias="RangeSlider.qml">sources/gui/qml/components/RangeSlider.qml</file>
         <file alias="MuteButton.qml">sources/gui/qml/components/MuteButton.qml</file>
         <file alias="UpDownButton.qml">sources/gui/qml/components/UpDownButton.qml</file>
         <file alias="ImageText.qml">sources/gui/qml/components/ImageText.qml</file>
         <file alias="WaitDone.qml">sources/gui/qml/components/WaitDone.qml</file>
+        <file alias="TimeCircle.qml">sources/gui/qml/components/TimeCircle.qml</file>
+        <file alias="Footer.qml">sources/gui/qml/components/Footer.qml</file>
     </qresource>
     <qresource prefix="/compounds">
         <file alias="PressureRangeSlider.qml">sources/gui/qml/compounds/PressureRangeSlider.qml</file>
-        <file alias="PreTreatmentTitleBar.qml">sources/gui/qml/compounds/PreTreatmentTitleBar.qml</file>
+        <file alias="StepNavigationTitleBar.qml">sources/gui/qml/compounds/StepNavigationTitleBar.qml</file>
         <file alias="InstructionView.qml">sources/gui/qml/compounds/InstructionView.qml</file>
         <file alias="CheckListView.qml">sources/gui/qml/compounds/CheckListView.qml</file>
     </qresource>
@@ -130,36 +130,17 @@
     <qresource prefix="/pages/pretreatment">
         <file alias="PreTreatmentBase.qml">sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml</file>
         <file alias="PreTreatmentMainStack.qml">sources/gui/qml/pages/pretreatment/PreTreatmentMainStack.qml</file>
+        <file alias="PreTreatmentWaterSampleStack.qml">sources/gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml</file>
+        <file alias="PreTreatmentConsumablesStack.qml">sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml</file>
+        <file alias="PreTreatmentDisposablesStack.qml">sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml</file>
     </qresource>
     <qresource prefix="/pages/pretreatment/create">
         <file alias="PreTreatmentCreateStack.qml">sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml</file>
         <file alias="PreTreatmentCreate.qml">sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml</file>
         <file alias="PreTreatmentConfirm.qml">sources/gui/qml/pages/pretreatment/create/PreTreatmentConfirm.qml</file>
     </qresource>
-    <qresource prefix="/pages/pretreatment/sample">
-        <file alias="PreTreatmentSampleStack.qml">sources/gui/qml/pages/pretreatment/sample/PreTreatmentSampleStack.qml</file>
-        <file alias="PreTreatmentFilterFlush.qml">sources/gui/qml/pages/pretreatment/sample/PreTreatmentFilterFlush.qml</file>
-        <file alias="PreTreatmentSampleResult.qml">sources/gui/qml/pages/pretreatment/sample/PreTreatmentSampleResult.qml</file>
-        <file alias="PreTreatmentWaterSample.qml">sources/gui/qml/pages/pretreatment/sample/PreTreatmentWaterSample.qml</file>
-        <file alias="PreTreatmentResultFail.qml">sources/gui/qml/pages/pretreatment/sample/PreTreatmentResultFail.qml</file>
-    </qresource>
-    <qresource prefix="/pages/pretreatment/consumables">
-        <file alias="PreTreatmentConsumablesStack.qml">sources/gui/qml/pages/pretreatment/consumables/PreTreatmentConsumablesStack.qml</file>
-        <file alias="PreTreatmentConsumablesSelfTest.qml">sources/gui/qml/pages/pretreatment/consumables/PreTreatmentConsumablesSelfTest.qml</file>
-        <file alias="PreTreatmentConsumablesInstallation.qml">sources/gui/qml/pages/pretreatment/consumables/PreTreatmentConsumablesInstallation.qml</file>
-    </qresource>
-    <qresource prefix="/pages/pretreatment/disposables">
-        <file alias="PreTreatmentDisposablesSelfTest.qml">sources/gui/qml/pages/pretreatment/disposables/PreTreatmentDisposablesSelfTest.qml</file>
-        <file alias="PreTreatmentDisposablesCartridgeInstallation.qml">sources/gui/qml/pages/pretreatment/disposables/PreTreatmentDisposablesCartridgeInstallation.qml</file>
-        <file alias="PreTreatmentDisposablesCartridgeConnection.qml">sources/gui/qml/pages/pretreatment/disposables/PreTreatmentDisposablesCartridgeConnection.qml</file>
-        <file alias="PreTreatmentDisposablesHeparinSyringe.qml">sources/gui/qml/pages/pretreatment/disposables/PreTreatmentDisposablesHeparinSyringe.qml</file>
-        <file alias="PreTreatmentDisposablesSalineBag.qml">sources/gui/qml/pages/pretreatment/disposables/PreTreatmentDisposablesSalineBag.qml</file>
-        <file alias="PreTreatmentDisposablesStack.qml">sources/gui/qml/pages/pretreatment/disposables/PreTreatmentDisposablesStack.qml</file>
-    </qresource>
     <qresource prefix="/pages/pretreatment/prime">
         <file alias="PreTreatmentPrimeStack.qml">sources/gui/qml/pages/pretreatment/prime/PreTreatmentPrimeStack.qml</file>
-        <file alias="PreTreatmentDrySelfTest.qml">sources/gui/qml/pages/pretreatment/prime/PreTreatmentDrySelfTest.qml</file>
-        <file alias="PreTreatmentDisposablesPrime.qml">sources/gui/qml/pages/pretreatment/prime/PreTreatmentDisposablesPrime.qml</file>
         <file alias="PreTreatmentUltrafiltration.qml">sources/gui/qml/pages/pretreatment/prime/PreTreatmentUltrafiltration.qml</file>
     </qresource>
     <qresource prefix="/pages/treatment/sections">