Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentConfirm.qml
===================================================================
diff -u -r43b80bc100e5bbc5f940e014cb622b5269a55e6c -rbd01334f257c35b96b7b232beacbcd7fae60c852
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentConfirm.qml	(.../PreTreatmentConfirm.qml)	(revision 43b80bc100e5bbc5f940e014cb622b5269a55e6c)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentConfirm.qml	(.../PreTreatmentConfirm.qml)	(revision bd01334f257c35b96b7b232beacbcd7fae60c852)
@@ -7,7 +7,7 @@
  *
  * \file    PreTreatmentConfirm.qml
  * \author  (last)      Behrouz NematiPour
- * \date    (last)      12-Jan-2021
+ * \date    (last)      01-Mar-2021
  * \author  (original)  Peter Lucia
  * \date    (original)  03-Aug-2020
  *
@@ -21,6 +21,7 @@
 //  Qml imports
 import "qrc:/globals"
 import "qrc:/components"
+import "qrc:/pages/pretreatment"
 
 /*!
  * \brief   Pre-Treatment confirm screen
@@ -29,22 +30,20 @@
 PreTreatmentBase { id: _root
     objectName: "_PreTreatmentConfirm"
 
-    signal confirmClicked()
+    header.confirmEnabled: _flickable.atYEnd
 
-    header.stepName: Variables.preTreatmentStepLabelConfirm
-
     Flickable { id: _flickable
         objectName: "_PreTreatmentConfirmFlickable"
         anchors {
-            top             : parent.top
-            topMargin       : header.height
-            bottom          : parent.bottom
-            bottomMargin    : 75
+            top             : _root.title.bottom
+            topMargin       : 15
+            bottom          : _root.bottom
+            bottomMargin    : Variables.notificationHeight + 15
             horizontalCenter: parent.horizontalCenter
         }
-        width: parent.width
-        contentWidth: parent.width
-        contentHeight: _column.implicitHeight
+        width           : _root.width
+        contentWidth    : _root.width
+        contentHeight   : _column.implicitHeight
         clip: true
 
         ScrollBar.vertical: ScrollBar { id: _scrollBar
@@ -63,26 +62,12 @@
             anchors.horizontalCenter: parent.horizontalCenter;
             anchors.fill: parent;
 
-            Text { id: _titleText
-                anchors.horizontalCenter: parent.horizontalCenter;
-                text: qsTr("Confirm Treatment")
-                color: Colors.textMain
-                font.pixelSize: Fonts.fontPixelTitle
-            }
             // insert the treatment information table here
             ConfirmTreatmentTable {
                 anchors.horizontalCenter: parent.horizontalCenter
-
             }
-
-            TouchRect { id : _continueRect
-                objectName: "_continueRect"
-                anchors.horizontalCenter: parent.horizontalCenter
-                text.text: qsTr("CONFIRM TREATMENT")
-                button.onClicked: {
-                    _root.confirmClicked()
-                }
-            }
         }
     }
+
+    onVisibleChanged: _flickable.contentY = 0 // scroll back to top
 }