diff --git a/xfel_calibrate/calibrate.py b/xfel_calibrate/calibrate.py
index a7655aa7b149c06e863c281e3ba11e8e17391ab8..34a25713ca37dd42bc528dc582107dcd5e4edce7 100755
--- a/xfel_calibrate/calibrate.py
+++ b/xfel_calibrate/calibrate.py
@@ -528,15 +528,24 @@ def run():
         # Write all input parameters to rst file to be included to final report
         parms = parameter_values(parms, **args)
         with open("{}/slurm_tmp_{}/InputParameters.rst".format(temp_path, run_uuid), "w") as finfile:
-            finfile.write("Input Parameters \n")
-            finfile.write("================ \n")
+            finfile.write("Input of the calibration pipeline \n")
+            finfile.write("================================= \n\n")
+            finfile.write(".. math::\n")
+            finfile.write("    \\begin{tabular}{ll}\n")
+            finfile.write("    \\hline\n")
             for p in parms:
-                finfile.write("{} \n\n".format(p.comment))
-                finfile.write(".. parsed-literal::\n")
+                #finfile.write("{} \n\n".format(p.comment))
+                #finfile.write(".. parsed-literal::\n")
                 if p.type is str:
-                    finfile.write("    {} = '{}' \n\n".format(p.name, p.value))
+                    tmpl = "    \\textbf{{-{{}}-{} }} & ``{}'', {}\\\\\n"
                 else:
-                    finfile.write("    {} = {} \n\n".format(p.name, p.value))
+                    tmpl = "    \\textbf{{-{{}}-{} }} & {}, {}\\\\\n"
+
+                finfile.write(tmpl.format(p.name.replace('_', '-'),
+                                          str(p.value).replace('_', '\\_'),
+                                          str(p.comment)[1:].replace('_', '\\_')))
+            finfile.write("    \\hline\n")
+            finfile.write("    \\end{tabular}\n")
 
         # wait on all jobs to run and then finalize the run by creating a report from the notebooks
         out_path = "{}/{}/{}/{}".format(report_path, detector.upper(),