Index: sources/gui/qml/pages/treatment/TreatmentPrime.qml
===================================================================
diff -u -rc3a1e077ddeba65709084f9af5dd756741db8b4f -rdf74454a7a75eb63ac577739c1fd0f179e479f44
--- sources/gui/qml/pages/treatment/TreatmentPrime.qml	(.../TreatmentPrime.qml)	(revision c3a1e077ddeba65709084f9af5dd756741db8b4f)
+++ sources/gui/qml/pages/treatment/TreatmentPrime.qml	(.../TreatmentPrime.qml)	(revision df74454a7a75eb63ac577739c1fd0f179e479f44)
@@ -30,7 +30,6 @@
  */
 ScreenItem { id: _root
     objectName: "_treatmentPrime"
-    backgroundRect.color: Colors.backgroundMainMenu
 
     signal clickedBack()
     signal clickedContinue()
@@ -41,123 +40,100 @@
         width: parent.width
         onClickedBack: {
             _root.clickedBack();
-
         }
         state: "prime"
     }
 
+    Text { id: _titleText
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.top: _root.top
+        anchors.topMargin: 150
+        text: qsTr("Priming")
+        color: Colors.textMain
+        font.pixelSize: Fonts.fontPixelTitle
+    }
 
-    Flickable { id: _flickable
-        objectName: "_treatmentPrimeFlickable"
-        anchors.top: _topMenuBar.bottom
-        anchors.left: parent.left
-        anchors.bottom: parent.bottom
-        width: parent.width
-        contentWidth: parent.width
-        contentHeight: _column.implicitHeight
-        clip: true
-        flickDeceleration: Variables.createTreatmentFlickableDeceleration
+    ProgressCircle { id: _circle
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.top: _titleText.bottom
+        anchors.topMargin: 25
+        minimum: 0
+        maximum: vPriming.secondsTotal
+        diameter: 100
+        value: vPriming.primingComplete ? vPriming.secondsTotal : vPriming.secondsRemaining
 
-        ScrollBar.vertical: ScrollBar { id: _scrollBar
-            anchors.right: _flickable.right
-            anchors.rightMargin: 3
-            contentItem: Rectangle {
-                color: Colors.backgroundRangeRect
-                implicitWidth: 6
-                radius: width / 2
-                width: 3
-            }
+        PrimingTimer { id: _timeText
+            anchors.centerIn: parent
+            seconds : vPriming.secondsRemaining
+            completed: vPriming.primingComplete
         }
+    }
 
-        Column { id: _column
-            spacing: Variables.treatmentSpacing
-            anchors.horizontalCenter: parent.horizontalCenter;
-            anchors.fill: parent;
+    Column { id: _checklist
+        spacing: 20
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.top: _circle.bottom
+        anchors.topMargin: 30
 
-            Text { id: _titleText
-                anchors.horizontalCenter: parent.horizontalCenter
-                text: qsTr("Priming")
-                color: Colors.textMain
-                font.pixelSize: Fonts.fontPixelTitle
-            }
+        CheckListItem { id: _checking_installation
+            anchors.horizontalCenter: parent.horizontalCenter
+            color   : Colors.transparent
+            text: qsTr("Checking installation")
+            completed: vPriming.checkingInstallationComplete
+        }
 
-            ProgressCircle { id: _circle
-                anchors.horizontalCenter: parent.horizontalCenter
-                minimum: 0
-                maximum: vPriming.secondsTotal
-                diameter: 100
-                value: vPriming.primingComplete ? vPriming.secondsTotal : vPriming.secondsRemaining
+        CheckListItem { id: _creating_dialysate
+            anchors.horizontalCenter: parent.horizontalCenter
+            color   : Colors.transparent
+            text    : qsTr("Creating dialysate")
+            completed: vPriming.creatingDialysateComplete
+        }
 
-                PrimingTimer { id: _timeText
-                    anchors.centerIn: parent
-                    seconds : vPriming.secondsRemaining
-                    completed: vPriming.primingComplete
-                }
-            }
+        CheckListItem { id: _priming_lines
+            anchors.horizontalCenter: parent.horizontalCenter
+            color   : Colors.transparent
+            text    : qsTr("Priming lines")
+            completed: vPriming.primingLinesComplete
+        }
+    }
 
-            Column { id: _checklist
-                spacing: 20
-                anchors.horizontalCenter: parent.horizontalCenter
+    Text { id: _priming_complete
+        objectName: "_primingCompleteText"
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.top: _checklist.bottom
+        anchors.topMargin: 45
+        text: qsTr("Priming Complete!")
+        color: vPriming.primingComplete ? Colors.textMain : Colors.transparent
+        font.pixelSize: Fonts.primingFontSize
+    }
 
-                CheckListItem { id: _checking_installation
-                    anchors.horizontalCenter: parent.horizontalCenter
-                    color: "transparent"
-                    text: "Checking installation"
-                    completed: vPriming.checkingInstallationComplete
-                }
-
-                CheckListItem { id: _creating_dialysate
-                    anchors.horizontalCenter: parent.horizontalCenter
-                    color: "transparent"
-                    text: "Creating dialysate"
-                    completed: vPriming.creatingDialysateComplete
-                }
-
-                CheckListItem { id: _priming_lines
-                    anchors.horizontalCenter: parent.horizontalCenter
-                    color: "transparent"
-                    text: "Priming lines"
-                    completed: vPriming.primingLinesComplete
-                }
+    TouchRect { id : _continueRect
+        objectName: "_treatmentPrimeContinueButton"
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.top: _priming_complete.bottom
+        anchors.topMargin: 50
+        width: 490
+        height: 60
+        text.text:   vPriming.continueBtnText
+        disabled : false  // it has not been implemeted in the FW so it is enabled always.
+        // /*! vPriming.primingComplete // */vPriming.continueEnabled
+        onEnabledChanged: {
+            if (enabled) {
+                borderColor = Colors.primingReady
+                textColor = Colors.primingReady
+            } else {
+                borderColor = Colors.primingNotReady
+                textColor = Colors.primingNotReady
             }
+        }
 
-            Text { id: _priming_complete
-                objectName: "_primingCompleteText"
-                anchors.horizontalCenter: parent.horizontalCenter
-                text: "Priming Complete!"
-                color: vPriming.primingComplete ? Colors.textMain : "transparent"
-                font.pixelSize: Fonts.primingFontSize
-            }
-
-            TouchRect { id : _continueRect
-                objectName: "_treatmentPrimeContinueButton"
-                anchors.horizontalCenter: parent.horizontalCenter
-                text.text: vPriming.continueBtnText
-                enabled: vPriming.continueEnabled
-                onEnabledChanged: {
-                    if (enabled) {
-                        borderColor = Colors.primingReady
-                        textColor = Colors.primingReady
-                    } else {
-                        borderColor = Colors.primingNotReady
-                        textColor = Colors.primingNotReady
-                    }
-                }
-
-                button.onClicked: {
-                    _root.clickedContinue()
-                }
-            }
-
-            Rectangle {
-                id: _spacer
-                height: 75
-                width: parent.width
-                color: "transparent"
-            }
+        button.onClicked: {
+            _root.clickedContinue()
         }
     }
 
+    //    }
+
     onVisibleChanged: {
         if (visible) {
             _mainMenu.hidden = true