Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml
===================================================================
diff -u -r53b262fea2d4b5bd78ff878fda0848f3737e7b74 -rc88bfbf7e61fb89d556b6851c7bd2747be75e1d3
--- sources/gui/qml/dialogs/DiagnosticsDialog.qml	(.../DiagnosticsDialog.qml)	(revision 53b262fea2d4b5bd78ff878fda0848f3737e7b74)
+++ sources/gui/qml/dialogs/DiagnosticsDialog.qml	(.../DiagnosticsDialog.qml)	(revision c88bfbf7e61fb89d556b6851c7bd2747be75e1d3)
@@ -84,13 +84,13 @@
         x: col(1)
         y: row(0)
         model: [
-            vDGDrainPump.rpmi           ,
-            vDGDrainPump.dac            ,
-            vDGDrainPump.state          ,
-            vDGDrainPump.rpmo           ,
-            vDGDrainPump.targetFLPMO    ,
-            vDGDrainPump.currentA       ,
-            vDGDrainPump.direction      ,
+            vDGDrainPump.rpmi                       ,
+            vDGDrainPump.dac                        ,
+            vDGDrainPump.state                      ,
+            vDGDrainPump.rpmo                       ,
+            vDGDrainPump.targetFLPMO    .toFixed(2) ,
+            vDGDrainPump.currentA       .toFixed(2) ,
+            vDGDrainPump.direction                  ,
         ]
         label: [
             "TgtSpd",
@@ -130,9 +130,9 @@
         x: col(3)
         y: row(0)
         model: [
-            vDGReservoir.activeReservoir ,
-            vDGReservoir.fillToVol       ,
-            vDGReservoir.drainToVol      ,
+            vDGReservoir.activeReservoir            ,
+            vDGReservoir.fillToVol                  ,
+            vDGReservoir.drainToVol                 ,
         ]
         label: [
             "Act",
@@ -158,6 +158,32 @@
         ]
     }
 
+    Text { id : _mouseEventCountText
+        text: String("Touch: %1,%2").arg(GuiEventSpy.touchCount   /*.toString().padStart(4,'0')*/ )
+                                    .arg(GuiEventSpy.touchPoints  /*.toString().padStart(4,'0')*/ )
+        x: col(3.5)
+        y: row(1.5)
+        visible: true
+        horizontalAlignment: Text.AlignLeft
+        color: Colors.textMain
+        font.pixelSize: Fonts.fontPixelDebugText
+        MouseArea {
+            anchors.fill: _mouseEventCountText
+            onClicked: GuiEventSpy.doTouchReset()
+        }
+    }
+
+    Text { id : _canbusFaultCountText
+        property int count: 0
+        text: qsTr("CANerr: %1").arg(count)
+        x: col(5.0)
+        y: row(1.5)
+        visible: true
+        horizontalAlignment: Text.AlignLeft
+        color: Colors.textMain
+        font.pixelSize: Fonts.fontPixelDebugText
+    }
+
     DebugDataColumn { id: _DGLoadCellReadingsColumn
         textObjectName  :"_DGLoadCellReadingsData"
         title           : qsTr(" LoadCl ")
@@ -585,34 +611,8 @@
         ]
     }
 
-    Text { id : _mouseEventCountText
-        text: String("Touch: %1,%2").arg(GuiEventSpy.touchCount   /*.toString().padStart(4,'0')*/ )
-                                    .arg(GuiEventSpy.touchPoints  /*.toString().padStart(4,'0')*/ )
-        x: col(0.3)
-        y: row(6.4)
-        visible: true
-        horizontalAlignment: Text.AlignLeft
-        color: Colors.textMain
-        font.pixelSize: Fonts.fontPixelDebugText
-        MouseArea {
-            anchors.fill: _mouseEventCountText
-            onClicked: GuiEventSpy.doTouchReset()
-        }
-    }
-
-    Text { id : _canbusFaultCountText
-        property int count: 0
-        text: qsTr("CANerr: %1").arg(count)
-        x: col(0.2)
-        y: row(6.8)
-        visible: true
-        horizontalAlignment: Text.AlignLeft
-        color: Colors.textMain
-        font.pixelSize: Fonts.fontPixelDebugText
-    }
-
     Text { id : _hdResetInformation
-        x: col(1.5)
+        x: col(0.2)
         y: row(6.4)
         visible: true
         text: "HDrst:" + vGeneralEvent.hdReset
@@ -622,7 +622,7 @@
     }
 
     Text { id : _dgResetInformation
-        x: col(1.5)
+        x: col(0.2)
         y: row(6.8)
         visible: true
         text: "DGrst:" + vGeneralEvent.dgReset