Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml
===================================================================
diff -u -r9143dd9055ada50b3ec13e7ce0671727a784f38f -r0cb2630813e6f7216adaf990f4129deb87b849bf
--- sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml	(.../DiagnosticsTD.qml)	(revision 9143dd9055ada50b3ec13e7ce0671727a784f38f)
+++ sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml	(.../DiagnosticsTD.qml)	(revision 0cb2630813e6f7216adaf990f4129deb87b849bf)
@@ -15,7 +15,7 @@
 
 // Qt
 import QtQuick 2.12
-
+import Gui.Actions 0.1
 // Project
 //  Qml imports
 import "qrc:/globals"
@@ -138,10 +138,41 @@
     }
 
 
+    DebugDataColumn { id: _TDTXStatesColumn
+        textObjectName  :"_TDTxStatesData"
+        title           : qsTr(" TXStates ")
+        x: col(0)
+        y: row(3.5)
+        model: [
+            Number(vTDTreatmentStates.subMode        ),
+            Number(vTDTreatmentStates.txBloodPrime   ),
+            Number(vTDTreatmentStates.txDialysis     ),
+            Number(vTDTreatmentStates.ufState        ),
+            Number(vTDTreatmentStates.txStop         ),
+            Number(vTDTreatmentStates.txRinseback    ),
+            Number(vTDTreatmentStates.txRecirculate  ),
+            Number(vTDTreatmentStates.txEnd          ),
+            Number(vTDTreatmentStates.salineState    ),
+            Number(vTDTreatmentStates.heparin        ),
+        ]
+        label: [
+            "subMode    " ,
+            "BPrime     " ,
+            "Dial       " ,
+            "UF         " ,
+            "Stop       " ,
+            "RB         " ,
+            "Recirc     " ,
+            "End        " ,
+            "Saline     " ,
+            "Hep        " ,
+        ]
+    }
+
     DebugDataColumn { id: _TDBatteryCoulumn
         textObjectName  :"_TDBatterypData"
         title           : qsTr(" Battery ")
-        x: col(0)
+        x: col(1.5)
         y: row(3.5)
         model: [
             vTDBattery.acPower          ,
@@ -156,7 +187,7 @@
     DebugDataColumn { id: _TDVoltageCoulumn
         textObjectName  :"_TDVoltageData"
         title           : qsTr(" Vol ")
-        x: col(1.5)
+        x: col(3)
         y: row(3.5)
         model: [
             vTDVoltage.line_1_2V    .toFixed(2) ,
@@ -189,7 +220,7 @@
     DebugDataColumn { id: _TDTemperatureCoulumn
         textObjectName  :"_TDTemperatureData"
         title           : qsTr(" Temp ")
-        x: col(3)
+        x: col(4.5)
         y: row(3.5)
         model: [
             vTDTemperature.boardTemp    .toFixed(2)
@@ -200,41 +231,9 @@
     }
 
 
-    DebugDataColumn { id: _TDTXStatesColumn
-        textObjectName  :"_TDTxStatesData"
-        title           : qsTr(" TXStates ")
-        x: col(0)
-        y: row(7)
-        model: [
-            vTDTreatmentStates.subMode      ,
-            vTDTreatmentStates.txBloodPrime ,
-            vTDTreatmentStates.txDialysis   ,
-            vTDTreatmentStates.ufState      ,
-            vTDTreatmentStates.txStop       ,
-            vTDTreatmentStates.txRinseback  ,
-            vTDTreatmentStates.txRecirculate,
-            vTDTreatmentStates.txEnd        ,
-            vTDTreatmentStates.salineState  ,
-            vTDTreatmentStates.heparin      ,
-        ]
-        label: [
-            "subMode    " ,
-            "BPrime     " ,
-            "Dial       " ,
-            "UF         " ,
-            "Stop       " ,
-            "RB         " ,
-            "Recirc     " ,
-            "End        " ,
-            "Saline     " ,
-            "Hep        " ,
-        ]
-    }
-
-
-    // TODO: The TouchRect should be unnecessary since the first communication message with UI/HD is the version.
+    // TODO: The TouchRect should be unnecessary since the first communication message with UI/TD is the version.
     TouchRect {
-        x           : col(6.0)
+        x           : col(9.0)
         y           : row(6.4)
         width       : 425
         height      : 80