Index: sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml
===================================================================
diff -u -re8ffaa51e4eb9b55efebebc13899f79d9a5ca946 -r2216ac6ac7f77437a7c29ac8b4043be01bc4609e
--- sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml	(.../PostTreatmentReview.qml)	(revision e8ffaa51e4eb9b55efebebc13899f79d9a5ca946)
+++ sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml	(.../PostTreatmentReview.qml)	(revision 2216ac6ac7f77437a7c29ac8b4043be01bc4609e)
@@ -34,10 +34,13 @@
     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
@@ -77,79 +80,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,