Index: sources/gui/qml/main.qml
===================================================================
diff -u -r3c30d57c6cba7595b1e1d6b806d90ca151bc8db2 -r8f45330e0b1af61e029bece73c9f23669ada56c1
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 3c30d57c6cba7595b1e1d6b806d90ca151bc8db2)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 8f45330e0b1af61e029bece73c9f23669ada56c1)
@@ -24,14 +24,17 @@
 
 // View classes
 import VHDAccelerometer                                     0.1
-import VUIPostSingleResult                                  0.1
 
 // Settings
 import VSettings                                            0.1
 import VAdjustmentVersions                                  0.1
 import VDateTime                                            0.1
 import VNetworkModel                                        0.1
 
+// Power on self test
+import VHDPostFinalResult                                   0.1
+import VUIPowerOnSelfTest                                   0.1
+
 // States views
 import VHDOperationMode                                     0.1
 import VPreTreatmentStates                                  0.1
@@ -49,8 +52,6 @@
 import VTreatmentRecirculate                                0.1
 import VTreatmentBloodPrime                                 0.1
 import VTreatmentRanges                                     0.1
-import VHDPostSingleResult                                  0.1
-import VHDPostFinalResult                                   0.1
 // Pre-Treatment
 import VPreTreatmentAdjustmentInitTreatment                 0.1
 import VDGFilterFlush                                       0.1
@@ -77,8 +78,6 @@
 import VDGValvesStates                                      0.1
 import VTreatmentCreate                                     0.1
 import VDGAccelerometer                                     0.1
-import VDGPostSingleResult                                  0.1
-import VDGPostFinalResult                                   0.1
 // In-Treatment - Adjustemnt
 import VTreatmentAdjustmentDuration                         0.1
 import VTreatmentAdjustmentFlows                            0.1
@@ -105,7 +104,6 @@
 import "qrc:/pages"
 import "qrc:/pages/treatment"
 import "qrc:/pages/settings"
-import "qrc:/pages/post"
 import "qrc:/components"
 import "qrc:/dialogs"
 
@@ -120,7 +118,6 @@
     VAdjustmentVersions                                 { id: vAdjustmentVersions                                   }
     VDateTime                                           { id: vDateTime                                             }
     VNetworkModel                                       { id: vNetwork                                              }
-    VUIPostSingleResult                                 { id: vUIPostSingleResult                                   }
     // ---- States
     VHDOperationMode                                    { id: vHDOperationMode                                      }
     VPreTreatmentStates                                 { id: vPreTreatmentStates                                   }
@@ -137,8 +134,8 @@
     VTreatmentRinseback                                 { id: vTreatmentRinseback                                   }
     VTreatmentRecirculate                               { id: vTreatmentRecirculate                                 }
     VHDAccelerometer                                    { id: vHDAccelerometer                                      }
-    VHDPostSingleResult                                 { id: vHDPostSingleResult                                   }
     VHDPostFinalResult                                  { id: vHDPostFinalResult                                   }
+    VUIPowerOnSelfTest                                  { id: vUIPostFinalResult                                   }
     // ---- DG
     VDGDrainPump                                        { id: vDGDrainPump                                          }
     VDGHeaters                                          { id: vDGHeaters                                            }
@@ -150,8 +147,6 @@
     VDGTemperatures                                     { id: vDGTemperatures                                       }
     VDGValvesStates                                     { id: vDGValvesStates                                       }
     VDGAccelerometer                                    { id: vDGAccelerometer                                      }
-    VDGPostSingleResult                                 { id: vDGPostSingleResult                                   }
-    VDGPostFinalResult                                  { id: vDGPostFinalResult                                   }
 
     // --- Pre-Treatment Progress Data
     VPreTreatmentAdjustmentInitTreatment                { id: vPreTreatmentAdjustmentInitTreatment                  }
@@ -225,8 +220,6 @@
 
 
     // 9 - Others
-    PostInProgress { id: _postInProgress }
-
     Text { // TEST : Application version should be moved into the information screen later.
         color   : Colors.textMain
         anchors {
@@ -278,10 +271,4 @@
         timeout             : _alarmItem.timeout
         backgroundFading    : vHDOperationMode.fault
     }
-
-    Component.onCompleted: {
-        // TODO: Re-show the main menu when re-entering the start screen
-        _mainMenu.visible = false
-        _mainStack.push(_postInProgress)
-    }
 }