Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml
===================================================================
diff -u -r89be2d248cac3f748b704cd62408cf8911991039 -r81aec0b1316a43c46f8c27c773d8f95e695ec273
--- sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml	(.../DiagnosticsTD.qml)	(revision 89be2d248cac3f748b704cd62408cf8911991039)
+++ sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml	(.../DiagnosticsTD.qml)	(revision 81aec0b1316a43c46f8c27c773d8f95e695ec273)
@@ -68,7 +68,7 @@
             title           : qsTr(" Air Trap ")
             anchors {
                 top         : parent.top
-                left        : _TDBloodFlowColumn.right
+                left        : _TDPressureOcclusionColumn.right
                 leftMargin  : spacing
             }
 
@@ -96,9 +96,9 @@
             textObjectName  :"_TDAirPumpData"
             title           : qsTr(" Air Pumps ")
             anchors {
-                top         : parent.top
-                left        : _TDAirTrapCoulumn.right
-                leftMargin  : spacing
+                top         : _TDAirTrapCoulumn.bottom
+                topMargin   : spacing
+                left        : _TDAirTrapCoulumn.left
             }
 
             model: [
@@ -116,9 +116,9 @@
             textObjectName  :"_TDAirBubblesData"
             title           : qsTr(" Bubbles ")
             anchors {
-                top         : _TDAirPumpColumn.bottom
+                top         : _TDPressureOcclusionColumn.bottom
                 topMargin   : spacing
-                left        : _TDAirPumpColumn.left
+                left        : _TDPressureOcclusionColumn.left
             }
 
             model: [
@@ -137,7 +137,7 @@
             title           : qsTr(" Valves ")
             anchors {
                 top         : parent.top
-                left        : _TDAirBubblesColumn.right
+                left        : _TDAirTrapCoulumn.right
                 leftMargin  : spacing
             }
             model: [
@@ -283,14 +283,14 @@
             ]
         }
 
-        DebugDataColumn { id: _TDPressureOcclusionCoulumn
+        DebugDataColumn { id: _TDPressureOcclusionColumn
             textObjectName  :"_TDPressureData"
             title           : qsTr(" Pressure ")
 
             anchors {
-                top         : _TDAirTrapCoulumn.bottom
-                topMargin   : spacing
-                left        : _TDAirTrapCoulumn.left
+                top         : parent.top
+                left        : _TDBloodFlowColumn.right
+                leftMargin  : spacing
             }
             model: [
                 vTreatmentPressureOcclusion.arterialPressure    .toFixed(2),
@@ -326,10 +326,9 @@
             textObjectName  :"_TDTemperatureData"
             title           : qsTr(" Temp ")
             anchors {
-                top         : _TDAirBubblesColumn.bottom
+                top         : _TDValvesColumn.bottom
                 topMargin   : spacing
-                left        : _TDPressureOcclusionCoulumn.right
-                leftMargin  : spacing
+                left        : _TDValvesColumn.left
             }
             model: [
                 vTDTemperature.boardTemp    .toFixed(2)
@@ -343,9 +342,9 @@
             textObjectName  :"_TDBatteryData"
             title           : qsTr(" Battery ")
             anchors {
-                top         : _TDTemperatureCoulumn.bottom
+                top         : _TDEjectorColumn.bottom
                 topMargin   : spacing
-                left        : _TDTemperatureCoulumn.left
+                left        : _TDEjectorColumn.left
             }
             model: [
                 vTDBattery.acPower          ,
@@ -357,17 +356,16 @@
             ]
         }
 
-//        // TODO: The TouchRect should be unnecessary since the first communication message with UI/TD is the version.
+        //        // TODO: The TouchRect should be unnecessary since the first communication message with UI/TD is the version.
         TouchRect {
             width       : _TDVersionsColumn.width
             height      : _TDVersionsColumn.height
             onClicked   : vAdjustmentVersions.doAdjustment()
             radius      : 10
             anchors {
                 bottom          : parent.bottom
-                bottomMargin    : spacing
                 right           : parent.right
-                rightMargin     : spacing
+                rightMargin     : Variables.defaultMargin
             }
             DebugDataColumn { id: _TDVersionsColumn
                 textObjectName          :"_TDVersionsData"