Index: denali.pro.user
===================================================================
diff -u -r213ca3711cd2ea573946055137532abfb55f908b -r6e4cc1f67e9290035b4e3a5be2eac04a85ae0c9a
--- denali.pro.user	(.../denali.pro.user)	(revision 213ca3711cd2ea573946055137532abfb55f908b)
+++ denali.pro.user	(.../denali.pro.user)	(revision 6e4cc1f67e9290035b4e3a5be2eac04a85ae0c9a)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.10.0, 2020-10-02T14:11:51. -->
+<!-- Written by QtCreator 4.10.0, 2020-10-02T16:35:39. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -89,7 +89,7 @@
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.12.5 GCC 64bit</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.12.5 GCC 64bit</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5125.gcc_64_kit</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
@@ -1185,7 +1185,7 @@
     <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
     <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/denali/Projects/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Release</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/denali/Projects/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Debug</value>
    </valuemap>
    <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
   </valuemap>
@@ -1475,76 +1475,6 @@
     <value type="int" key="PE.EnvironmentAspect.Base">1</value>
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">denali (on Generic Linux Device (iMX8))2</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">RemoteLinuxRunConfiguration:/home/denali/Projects/application/denali.pro</value>
-    <value type="int" key="RemoteLinux.EnvironmentAspect.Version">1</value>
-    <value type="QString" key="RemoteLinux.RunConfig.AlternateRemoteExecutable"></value>
-    <value type="bool" key="RemoteLinux.RunConfig.UseAlternateRemoteExecutable">false</value>
-    <value type="QString" key="RunConfiguration.Arguments">-u</value>
-    <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
-    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
-    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
-    <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
-    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
-    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
-    <value type="bool" key="RunConfiguration.UseX11Forwarding">false</value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory.default"></value>
-    <value type="QString" key="RunConfiguration.X11Forwarding">:0</value>
-   </valuemap>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.1">
-    <value type="QString" key="Analyzer.Perf.CallgraphMode">dwarf</value>
-    <valuelist type="QVariantList" key="Analyzer.Perf.Events">
-     <value type="QString">cpu-cycles</value>
-    </valuelist>
-    <valuelist type="QVariantList" key="Analyzer.Perf.ExtraArguments"/>
-    <value type="int" key="Analyzer.Perf.Frequency">250</value>
-    <value type="QString" key="Analyzer.Perf.SampleMode">-F</value>
-    <value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
-    <value type="int" key="Analyzer.Perf.StackSize">4096</value>
-    <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
-    <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
-    <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
-    <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
-    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
-    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
-    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
-    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
-    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
-    <value type="QString" key="Analyzer.Valgrind.KCachegrindExecutable">kcachegrind</value>
-    <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
-    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
-    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
-    <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
-    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
-    <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
-    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
-    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
-    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
-     <value type="int">0</value>
-     <value type="int">1</value>
-     <value type="int">2</value>
-     <value type="int">3</value>
-     <value type="int">4</value>
-     <value type="int">5</value>
-     <value type="int">6</value>
-     <value type="int">7</value>
-     <value type="int">8</value>
-     <value type="int">9</value>
-     <value type="int">10</value>
-     <value type="int">11</value>
-     <value type="int">12</value>
-     <value type="int">13</value>
-     <value type="int">14</value>
-    </valuelist>
-    <value type="int" key="PE.EnvironmentAspect.Base">1</value>
-    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName"></value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">denali (on UI Test Board)</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">RemoteLinuxRunConfiguration:/home/denali/Projects/application/denali.pro</value>
     <value type="int" key="RemoteLinux.EnvironmentAspect.Version">1</value>
@@ -1562,7 +1492,7 @@
     <value type="QString" key="RunConfiguration.WorkingDirectory.default"></value>
     <value type="QString" key="RunConfiguration.X11Forwarding">:0</value>
    </valuemap>
-   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">2</value>
+   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
   </valuemap>
  </data>
  <data>
Index: sources/gui/qml/components/ConfirmTreatmentTable.qml
===================================================================
diff -u -r074b32b5cc08f41f2d9ce0d021f2151b76bba5ad -r6e4cc1f67e9290035b4e3a5be2eac04a85ae0c9a
--- sources/gui/qml/components/ConfirmTreatmentTable.qml	(.../ConfirmTreatmentTable.qml)	(revision 074b32b5cc08f41f2d9ce0d021f2151b76bba5ad)
+++ sources/gui/qml/components/ConfirmTreatmentTable.qml	(.../ConfirmTreatmentTable.qml)	(revision 6e4cc1f67e9290035b4e3a5be2eac04a85ae0c9a)
@@ -108,6 +108,14 @@
         prescriptionValues: vTreatmentCreate.getPrescriptionParameterValues()
         operatingKeys: vTreatmentCreate.getOperatingParameterNames()
         operatingValues: vTreatmentCreate.getOperatingParameterValues()
+        onVisibleChanged: {
+            if (visible) {
+                prescriptionKeys = vTreatmentCreate.getPrescriptionParameterNames()
+                prescriptionValues = vTreatmentCreate.getPrescriptionParameterValues()
+                operatingKeys = vTreatmentCreate.getOperatingParameterNames()
+                operatingValues = vTreatmentCreate.getOperatingParameterValues()
+            }
+        }
 
     }
 
Index: sources/gui/qml/pages/treatment/TreatmentCreate.qml
===================================================================
diff -u -r12cfad32f345ac72d777f9b97d25bdd4d0848527 -r6e4cc1f67e9290035b4e3a5be2eac04a85ae0c9a
--- sources/gui/qml/pages/treatment/TreatmentCreate.qml	(.../TreatmentCreate.qml)	(revision 12cfad32f345ac72d777f9b97d25bdd4d0848527)
+++ sources/gui/qml/pages/treatment/TreatmentCreate.qml	(.../TreatmentCreate.qml)	(revision 6e4cc1f67e9290035b4e3a5be2eac04a85ae0c9a)
@@ -170,7 +170,7 @@
                 id: _salineBolus
                 objectName: "_salineBolusRect"
                 text: "Saline Bolus"
-                units: qsTr(" min")
+                units: qsTr(" mL")
                 min: vTreatmentCreate.salineBolusVolumeMin
                 max: vTreatmentCreate.salineBolusVolumeMax
                 step: vTreatmentCreate.salineBolusVolumeRes
Index: sources/view/VTreatmentCreate.cpp
===================================================================
diff -u -rf7b3e0bcd926f8aabc5caa1e76fce04aa8c5eb89 -r6e4cc1f67e9290035b4e3a5be2eac04a85ae0c9a
--- sources/view/VTreatmentCreate.cpp	(.../VTreatmentCreate.cpp)	(revision f7b3e0bcd926f8aabc5caa1e76fce04aa8c5eb89)
+++ sources/view/VTreatmentCreate.cpp	(.../VTreatmentCreate.cpp)	(revision 6e4cc1f67e9290035b4e3a5be2eac04a85ae0c9a)
@@ -817,10 +817,16 @@
     QString dType;
     if ((acidConcentrateOptions().length() - 1 < (int)_acidConcentrate) || ((int)_acidConcentrate < 0))
         aConcentrate = "None";
+    else
+        aConcentrate = acidConcentrateOptions().at(get_acidConcentrate());
     if ((bicarbonateConcentrateOptions().length() - 1 < (int)_bicarbonateConcentrate) || ((int)_bicarbonateConcentrate < 0))
         bCarbConcentrate = "None";
+    else
+        bCarbConcentrate = bicarbonateConcentrateOptions().at(get_bicarbonateConcentrate());
     if ((dialyzerTypeOptions().length() - 1 < (int)_dialyzerType) || ((int)_dialyzerType < 0))
         dType = "None";
+    else
+        dType = dialyzerTypeOptions().at(get_dialyzerType());
     return QStringList() << aConcentrate
                          << bCarbConcentrate
                          << dType