Index: sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml
===================================================================
diff -u -rb0ad6789ac542b1c24db1d89af3d4e1411a4d4f1 -r4c6c526a02ea5dec5c13b9a93a58627cfec2a136
--- sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml	(.../PostTreatmentReview.qml)	(revision b0ad6789ac542b1c24db1d89af3d4e1411a4d4f1)
+++ sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml	(.../PostTreatmentReview.qml)	(revision 4c6c526a02ea5dec5c13b9a93a58627cfec2a136)
@@ -34,11 +34,14 @@
         spacing     : Variables.defaultMargin
         height      : 75
 
-    ScrollBar {
-        anchors.fill: _flickable
-        flickable   : _flickable
-        color       : Colors.backgroundDialog
-    }
+        anchors {
+            top             : header.bottom
+            topMargin       : Variables.defaultMargin / 2
+            left            : parent.left
+            leftMargin      : Variables.defaultMargin * 4
+            right           : parent.right
+            rightMargin     : Variables.defaultMargin * 4
+        }
 
         Item { id: _legend
             width: _root.columnWidth
@@ -63,7 +66,6 @@
             }
         }
 
-
         Item { id: _qrContainer
             width: _root.columnWidth
             height: _topRow.height
Index: sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml
===================================================================
diff -u -rc70815ad2b3beadf61832f2e4d12eb90d476e020 -r4c6c526a02ea5dec5c13b9a93a58627cfec2a136
--- sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml	(.../PreTreatmentInstallStack.qml)	(revision c70815ad2b3beadf61832f2e4d12eb90d476e020)
+++ sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml	(.../PreTreatmentInstallStack.qml)	(revision 4c6c526a02ea5dec5c13b9a93a58627cfec2a136)
@@ -25,15 +25,6 @@
     property int subStepIndex: PreTreatmentInstallStack.Step.BloodSetTubing
     property int    stepIndex: PreTreatmentStack.Step.Installation
 
-    onVisibleChanged: {
-        if (visible) {
-            _headerBar.activeStack = stackView
-        }
-        else {
-            stackView.initialItem = null
-        }
-    }
-
     stackView.onCurrentItemChanged: _headerBar.activeStack = stackView
 
     signal goToNextStep()
@@ -125,5 +116,8 @@
             _headerBar.activeStack = stackView
             initStack()
         }
+        else {
+            stackView.initialItem = null
+        }
     }
 }