Index: sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml
===================================================================
diff -u -re125bd5cf13750eaf241d518b9c846139afaa81c -r577ab4647b2584d4e32b26797281ec1543d2e1aa
--- sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml	(.../PostTreatmentReview.qml)	(revision e125bd5cf13750eaf241d518b9c846139afaa81c)
+++ sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml	(.../PostTreatmentReview.qml)	(revision 577ab4647b2584d4e32b26797281ec1543d2e1aa)
@@ -30,25 +30,23 @@
 PostTreatmentBase { id: _root
     signal itemClicked(int vIndex)
 
+    readonly property alias itemsText : _parametersGrid.itemsText
+    readonly property alias itemsValue: _parametersGrid.itemsValue
+    readonly property alias itemsUnit : _parametersGrid.itemsUnit
+
+    header.confirmText.text: qsTr("NEXT")
+
     ExportButton {
         anchors.top     : parent.top
         anchors.left    : parent.left
-        exportTreatment : true
+        exportFunction  : vPostTreatmentAdjustmentTreatmentLog.doExport
+        enabled         : vPostTreatmentAdjustmentTreatmentLog.isIdle && _GuiView.usbReady
     }
 
-    Rectangle { id: _backgroud
-        clip: true
+    ScrollBar {
         anchors.fill: _flickable
-        color   : Colors.backgroundDialog
-        radius  : 5
-        Rectangle { id: _scrollbar
-            anchors.right: parent.right
-            width   : 5
-            radius  : width
-            y       : _flickable.height * _flickable.visibleArea.yPosition
-            height  : _flickable.height * _flickable.visibleArea.heightRatio
-            color   : "#80696969" // half transparent dimgray
-        }
+        flickable   : _flickable
+        backColor   : Colors.backgroundDialog
     }
 
     Flickable { id: _flickable
@@ -60,7 +58,7 @@
             bottomMargin    : Variables.notificationHeight + Variables.minVGap
             horizontalCenter: parent.horizontalCenter
         }
-        width        : parent.width - Variables.minVGap * 2 // * 2 : for each side
+        width        : parent.width - Variables.minVGap2 * 2 // * 2 : for each side
         contentWidth : width
         contentHeight: _parametersGrid.height
 
@@ -73,79 +71,11 @@
             rowSpacing      : 0
             columnSpacing   : 50
             lineColor       : Colors.backgroundMain
+            itemsText       : vPostTreatmentAdjustmentTreatmentLog.parametersTitle
             itemsValue      : vPostTreatmentAdjustmentTreatmentLog.parametersText
-            itemsText       : [
-                qsTr("Blood Flow Rate"                  ),
-                qsTr("Dialysate Flow Rate"              ),
-                qsTr("Treatment Duration"               ),
-                qsTr("Actual Treatment Duration"        ),
-                qsTr("Acid ConcentrateType"             ),
-                qsTr("Bicarbonate Concentrate Type"     ),
-                qsTr("Potassium Concentration"          ),
-                qsTr("Calcium Concentration"            ),
-                qsTr("Bicarbonate Concentration"        ),
-                qsTr("Sodium Concentration"             ),
-                qsTr("Dialysate Temperature"            ),
-                qsTr("Dialyzer Type"                    ),
-                qsTr("Treatment DateTime"               ),
-                qsTr("Average Blood Flow"               ),
-                qsTr("Average Dialysate Flow"           ),
-                qsTr("Dialysate Volume Used"            ),
-                qsTr("Average Dialysate Temp"           ),
-                qsTr("Target UF Volume"                 ),
-                qsTr("Actual UF Volume"                 ),
-                qsTr("Target UF Rate"                   ),
-                qsTr("Actual UF Rate"                   ),
-                qsTr("Saline Bolus Volume"              ),
-                qsTr("Heparin Type"                     ),
-                qsTr("Heparin Concentration"            ),
-                qsTr("Heparin Bolus Volume"             ),
-                qsTr("Heparin Dispense Rate"            ),
-                qsTr("Heparin Pre-Stop"                 ),
-                qsTr("Heparin Delivered Volume"         ),
-                qsTr("Average Arterial Pressure"        ),
-                qsTr("Average Venous Pressure"          ),
-                qsTr("End Treatment Early Alarm"        ),
-                qsTr("Device ID"                        ),
-                qsTr("Water Sample Test Result"         ),
-            ]
-            itemsUnit       : [
-                Variables.unitTextFlowRate              ,
-                Variables.unitTextFlowRate              ,
-                Variables.unitTextDuration              ,
-                Variables.unitTextDuration              ,
-                ""                                      ,
-                ""                                      ,
-                Variables.unitTextConcentration         ,
-                Variables.unitTextConcentration         ,
-                Variables.unitTextConcentration         ,
-                Variables.unitTextConcentration         ,
-                Variables.unitTextTemperature           ,
-                ""                                      ,
-                ""                                      ,
-                Variables.unitTextFlowRate              ,
-                Variables.unitTextFlowRate              ,
-                Variables.unitTextVolume                ,
-                Variables.unitTextTemperature           ,
-                Variables.unitTextVolume                ,
-                Variables.unitTextVolume                ,
-                Variables.unitTextFlowRate              ,
-                Variables.unitTextFlowRate              ,
-                Variables.unitTextFluid                 ,
-                ""                                      ,
-                Variables.unitTextHeparinConcentration  ,
-                Variables.unitTextFluid                 ,
-                Variables.unitTextDispencingRate        ,
-                Variables.unitTextDuration              ,
-                Variables.unitTextFluid                 ,
-                Variables.unitTextBloodPressure         ,
-                Variables.unitTextBloodPressure         ,
-                ""                                      ,
-                ""                                      ,
-                ""
-            ]
-            itemsValueLeftMargin    : 350
-            itemsUnitLeftMargin     : 495
+            itemsUnit       : vPostTreatmentAdjustmentTreatmentLog.parametersUnit
+            itemsValueLeftMargin    : 350 // if decreased maybe covered by title
+            itemsUnitLeftMargin     : 470 // if increased will be covered by chevron if touchable
             itemsTouchable  : [
                 0,0,0,0,1,0,0,0,0,0,
                 1,0,0,0,0,0,0,0,0,0,
@@ -156,3 +86,4 @@
         }
     }
 }
+