Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsSwipe.qml
===================================================================
diff -u -r57f4e55fd9102dce870271ec379d44aa478128fe -r69c86c57349b7d4a6ba47a801ba27b1c470fade5
--- sources/gui/qml/dialogs/diagnostics/DiagnosticsSwipe.qml	(.../DiagnosticsSwipe.qml)	(revision 57f4e55fd9102dce870271ec379d44aa478128fe)
+++ sources/gui/qml/dialogs/diagnostics/DiagnosticsSwipe.qml	(.../DiagnosticsSwipe.qml)	(revision 69c86c57349b7d4a6ba47a801ba27b1c470fade5)
@@ -20,39 +20,54 @@
 //  Qml imports
 import "qrc:/globals"
 import "qrc:/components"
-import "qrc:/dialogs"
-import "qrc:/pages/pretreatment/connection"
 /*!
  * \brief   the pre treatment prime stack screen
  */
 Item { id: _root
-
     SwipeView { id: view
         currentIndex: 0
         anchors.fill: parent
 
-        DiagnosticsTD { id: tdPage }
-        DiagnosticsDD { id: ddPage }
-        DiagnosticsBase { id: fpPage }
+        DiagnosticsTD { id: _tdPage }
+        DiagnosticsDD { id: _ddPage }
+        DiagnosticsFP { id: _fpPage }
+
+        onCurrentIndexChanged: _menu.index = currentIndex
     }
 
-    PageIndicator { id: indicator
-        objectName: "_DiagnosticsSwipeIndicator"
-        count: view.count
-        currentIndex: view.currentIndex
+    MainMenu { id: _menu
+        anchors {
+            top             : parent.top
+            left            : parent.left
+            leftMargin      : Variables.defaultMargin * 4
+            right           : parent.right
+            rightMargin     : Variables.defaultMargin * 4
+        }
 
-        anchors.bottom: view.bottom
-        anchors.horizontalCenter: parent.horizontalCenter
-        spacing: 10
-        delegate: Rectangle {
-            implicitWidth: 15
-            implicitHeight: 15
-            radius: width // Make it circular
-            color: "white"
-            opacity: index === view.currentIndex ? 1 : pressed ? 0.7 : 0.25
-            Behavior on opacity {
-                OpacityAnimator { duration: 100 } // Animate opacity changes
+        width               : _root.width
+        index               : view.currentIndex
+        color               : Colors.transparent
+        titlePixelSize      : 30
+        model               : _model
+
+        onItemPressed: function (vIndex) {
+            view.currentIndex = vIndex
+        }
+
+        ListModel { id: _model
+            ListElement {   text: qsTr("TD & Blood Handling")   ; visible: true   }
+            ListElement {   text: qsTr("DD")                    ; visible: true   }
+            ListElement {   text: qsTr("FP")                    ; visible: true   }
+        }
+
+        Line {
+            anchors {
+                bottom  : parent.bottom
+                right   : parent.right
+                left    : parent.left
             }
+
+            color   : Colors.panelBorderColor
         }
     }
 }