Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentConfirm.qml
===================================================================
diff -u -r159f2bb0317c7c3c0336e4cb80c7fef3f87e329a -rf9e747f0f28df1cc6a33179f0bc78bfc03d486fc
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentConfirm.qml	(.../PreTreatmentConfirm.qml)	(revision 159f2bb0317c7c3c0336e4cb80c7fef3f87e329a)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentConfirm.qml	(.../PreTreatmentConfirm.qml)	(revision f9e747f0f28df1cc6a33179f0bc78bfc03d486fc)
@@ -21,6 +21,7 @@
 //  Qml imports
 import "qrc:/globals"
 import "qrc:/components"
+import "qrc:/compounds"
 import "qrc:/pages/pretreatment"
 
 /*!
@@ -39,30 +40,38 @@
     //     anchors.leftMargin  : Variables.minVGap2
     // }
 
+    Label { id: _txCode
+        anchors.bottom  : _flickable.top
+        anchors.left    : _flickable.left
+        width           : _flickable.width
+        text            : qsTr("Code: ") + vTreatmentCreate.txCode
+        font.pixelSize  : Fonts.fontPixelButton
+    }
+
     Flickable { id: _flickable
         objectName: "_PreTreatmentConfirmFlickable"
         interactive: false
         Background { // Used instead of ScrollBar background
             color   : Colors.backgroundDialog
-            anchors.rightMargin : Variables.minVGap2
-            anchors.leftMargin  : Variables.minVGap2
+            // anchors.rightMargin : Variables.minVGap2
+            // anchors.leftMargin  : Variables.minVGap2
         }
+        clip: true
         anchors {
             top             : _root.title.bottom
-            topMargin       : 15
+            topMargin       : Variables.minVGap * 2 // * 2 : it was too close to title and also better with rows not half cut.
             bottom          : _root.bottom
-            bottomMargin    : Variables.notificationHeight + 15
+            bottomMargin    : Variables.notificationHeight + Variables.minVGap
             horizontalCenter: parent.horizontalCenter
         }
-        width           : _root.width
-        contentWidth    : _root.width
-        contentHeight   : _column.implicitHeight
-        clip: true
+        width        : parent.width - Variables.minVGap2 * 2 // * 2 : for each side
+        contentWidth : width
+        contentHeight: height
 
+        // TODO: remove this and the sub components and use the TouchGrid instead like in the PostTreatmentReview.qml
         Column { id: _column
             anchors.horizontalCenter: parent.horizontalCenter;
             anchors.fill: parent;
-
             // insert the treatment information table here
             ConfirmTreatmentTable {
                 anchors.horizontalCenter: parent.horizontalCenter