Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml
===================================================================
diff -u -rb378a3d85d11491f34fb88d6ead8460f9c27abe4 -re12bcd41f4bbc3f4a97f338ffb9d20c1a04f5f83
--- sources/gui/qml/dialogs/DiagnosticsDialog.qml	(.../DiagnosticsDialog.qml)	(revision b378a3d85d11491f34fb88d6ead8460f9c27abe4)
+++ sources/gui/qml/dialogs/DiagnosticsDialog.qml	(.../DiagnosticsDialog.qml)	(revision e12bcd41f4bbc3f4a97f338ffb9d20c1a04f5f83)
@@ -444,71 +444,77 @@
         ]
     }
 
-    // TODO: Should be unnecessary since the first communication message with UI/HD is the version.
-    // TouchRect {
-    //     x           : col(6.6)
-    //     y           : row(5.8)
-    //     width       : 150
-    //     height      : 35
-    //     text.text   : "Get Version"
-    //     onClicked   : vAdjustmentVersions.doAdjustment()
-    // }
-
     DebugDataColumn { id: _HDAlarmTopColumn
         textObjectName  :"_HDAlarmTopData"
         title           : qsTr(" Alarms ")
         x: col(6)
         y: row(5.5)
-        model: [ _alarmItem.alarm_AlarmID   ]
-        label: [ "Top"                      ]
+        model: [ _alarmItem.alarm_AlarmID ]
+        label: [ "Top"                    ]
     }
 
-    DebugDataColumn { id: _HDVersionsColumn
-        textObjectName  :"_HDVersionsData"
-        title           : ""
-        x: col(6.8)
-        y: row(6)
-        fontPixelSizeText: 30
-        model: [ "HD: v%1.%2.%3-%4 v%5.%6.%7-%8 c%9"
-            .arg(vAdjustmentVersions.hdVerMajor             )
-            .arg(vAdjustmentVersions.hdVerMinor             )
-            .arg(vAdjustmentVersions.hdVerMicro             )
-            .arg(vAdjustmentVersions.hdVerBuild             )
-            .arg(vAdjustmentVersions.hdVerFPGAMajor         )
-            .arg(vAdjustmentVersions.hdVerFPGAMinor         )
-            .arg(vAdjustmentVersions.hdVerFPGALab           )
-            .arg(vAdjustmentVersions.hdVerFPGAId            )
-            .arg(vAdjustmentVersions.hdVerCompatibilityRev  )
-        ]
-    }
+    // TODO: Should be unnecessary since the first communication message with UI/HD is the version.
+    TouchRect {
+        x           : col(4.2)
+        y           : row(6.4)
+        width       : 550
+        height      : 80
+        onClicked   : vAdjustmentVersions.doAdjustment()
+        radius      : 10
+        Column {
+            anchors.top : parent.top
+            anchors.topMargin: -20
+            anchors.left: parent.left
+            anchors.leftMargin: 5
 
-    DebugDataColumn { id: _DGVersionsColumn
-        textObjectName  :"_DGVersionsData"
-        title           : ""
-        x: col(6.8)
-        y: row(6.5)
-        fontPixelSizeText: 30
-        model: [ "DG: v%1.%2.%3-%4 v%5.%6.%7-%8 c%9"
-            .arg(vAdjustmentVersions.dgVerMajor             )
-            .arg(vAdjustmentVersions.dgVerMinor             )
-            .arg(vAdjustmentVersions.dgVerMicro             )
-            .arg(vAdjustmentVersions.dgVerBuild             )
-            .arg(vAdjustmentVersions.dgVerFPGAMajor         )
-            .arg(vAdjustmentVersions.dgVerFPGAMinor         )
-            .arg(vAdjustmentVersions.dgVerFPGALab           )
-            .arg(vAdjustmentVersions.dgVerFPGAId            )
-            .arg(vAdjustmentVersions.dgVerCompatibilityRev  )
-        ]
+            spacing: -30
+            DebugDataColumn { id: _HDVersionsColumn
+                textObjectName  :"_HDVersionsData"
+                title           : ""
+                horizontalAlignmentText: Text.AlignLeft
+                fontPixelSizeText: 30
+                model: [ "HD: v%1.%2.%3-%4 v%5.%6.%7-%8 c%9"
+                    .arg(vAdjustmentVersions.hdVerMajor             )
+                    .arg(vAdjustmentVersions.hdVerMinor             )
+                    .arg(vAdjustmentVersions.hdVerMicro             )
+                    .arg(vAdjustmentVersions.hdVerBuild             )
+                    .arg(vAdjustmentVersions.hdVerFPGAMajor         )
+                    .arg(vAdjustmentVersions.hdVerFPGAMinor         )
+                    .arg(vAdjustmentVersions.hdVerFPGALab           )
+                    .arg(vAdjustmentVersions.hdVerFPGAId            )
+                    .arg(vAdjustmentVersions.hdVerCompatibilityRev  )
+                ]
+            }
+
+            DebugDataColumn { id: _DGVersionsColumn
+                textObjectName  :"_DGVersionsData"
+                title           : ""
+                horizontalAlignmentText: Text.AlignLeft
+                fontPixelSizeText: 30
+                model: [ "DG: v%1.%2.%3-%4 v%5.%6.%7-%8 c%9"
+                    .arg(vAdjustmentVersions.dgVerMajor             )
+                    .arg(vAdjustmentVersions.dgVerMinor             )
+                    .arg(vAdjustmentVersions.dgVerMicro             )
+                    .arg(vAdjustmentVersions.dgVerBuild             )
+                    .arg(vAdjustmentVersions.dgVerFPGAMajor         )
+                    .arg(vAdjustmentVersions.dgVerFPGAMinor         )
+                    .arg(vAdjustmentVersions.dgVerFPGALab           )
+                    .arg(vAdjustmentVersions.dgVerFPGAId            )
+                    .arg(vAdjustmentVersions.dgVerCompatibilityRev  )
+                ]
+            }
+        }
     }
 
     DebugDataColumn { id: _PreTreatmentStatesColumn
         textObjectName  :"_PreTreatmentStatesData"
         title           : qsTr(" PreTx States ")
-        x: col(0.7)
+        x: col(1.0)
         y: row(5.5)
-        model: [ "%1,%2,%3,%4,%5,%6,%7,%8"
+        model: [ "%1,%2,%3,%4,%5,%6,%7,%8,%9"
             .arg(vPreTreatmentStates.subMode                 )
             .arg(vPreTreatmentStates.waterSampleState        )
+            .arg(vPreTreatmentStates.selfTestConsumablesState)
             .arg(vPreTreatmentStates.selfTestNoCartridgeState)
             .arg(vPreTreatmentStates.installationState       )
             .arg(vPreTreatmentStates.selfTestDryState        )
@@ -546,7 +552,7 @@
     }
 
     Text { id : _hdResetInformation
-        x: col(2.0)
+        x: col(1.5)
         y: row(6.4)
         visible: true
         text: "HDrst:" + vGeneralEvent.hdReset
@@ -556,7 +562,7 @@
     }
 
     Text { id : _dgResetInformation
-        x: col(2.0)
+        x: col(1.5)
         y: row(6.8)
         visible: true
         text: "DGrst:" + vGeneralEvent.dgReset