diff -r cdd6167a71de -r 53622e770eca eskp.py
--- a/eskp.py	Mon Feb 03 23:07:26 2020 +0100
+++ b/eskp.py	Tue Feb 04 08:47:05 2020 +0100
@@ -309,7 +309,7 @@
 def ozoneloss_uvi():
     filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_uvi.rst")
     content = get_content(filename)
-    htmlfile = os.path.join("templates", get_locale(), "html", "ozoneloss_uvi_form.html")
+    htmlfile = os.path.join("templates", get_locale(), "html", "ozoneloss_uvi_form_start.html")
     html_content = get_html_content(htmlfile)
     htmlfile = os.path.join("templates", get_locale(), "html", "uvi_table.html")
     html_table = get_html_content(htmlfile)
@@ -317,11 +317,10 @@
     lat = 50.
     o3offset = 50.
     figname = "uvincr_lat%0.3i_do3%0.3i.svg" % (lat, o3offset)
-    button_text = _("Graph anzeigen")
 
     return render_template('ozoneloss_uvi.html', act="ozoneloss/uvi", content=content, figname=figname,
                            alt=_(u"UV increase at {{lat}} degrees N for {{o3offset}} DU ozone depletion"),
-                                 html_content=html_content, html_table=html_table, button_text=button_text)
+                                 html_content=html_content, html_table=html_table)
 
 
 @app.route("/ozoneloss/uvi_graph", methods=['POST'])
@@ -337,21 +336,20 @@
     o3offsetstr = request.form['Dobson-Unit']
 
     latstr2 = latstr.replace(u'\xb0', '')
-
     if latstr2.endswith(u'N'):
         latstr2 = latstr2.replace(u'N', '')
         lat = float(latstr2)
     if latstr2.endswith(u'S'):
         latstr2 = latstr2.replace(u'S', '')
         lat = -float(latstr2)
+        
+    html_content = html_content.replace('{{latstr}}', latstr)
+    html_content = html_content.replace('{{o3offsetstr}}', o3offsetstr)
+    figname = "uvincr_lat%0.3i_do3%0.3i.svg" % (lat, float(o3offsetstr))
 
-    figname = "uvincr_lat%0.3i_do3%0.3i.svg" % (lat, float(o3offsetstr))
-    button_text = _("Graph anzeigen")
-
-    return render_template('graph.html', act="ozoneloss_uvi_graph", content=content, figname=figname,
+    return render_template('ozoneloss_uvi.html', act="ozoneloss_uvi_graph", content=content, figname=figname,
                            alt=_(u"UV increase at {{lat}} degrees N for {{o3offset}} DU ozone depletion"),
-                           o3offsetstr=o3offsetstr, latstr=latstr, html_content=html_content,
-                           html_table=html_table, button_text=button_text)
+                           html_content=html_content, html_table=html_table)
 
 @app.route("/ozoneloss/decadal")
 def ozoneloss_decadal():