diff --git a/fir_todos/templates/fir_todos/plugins/followup_main.html b/fir_todos/templates/fir_todos/plugins/followup_main.html
index 2cb18b9c..653925ec 100755
--- a/fir_todos/templates/fir_todos/plugins/followup_main.html
+++ b/fir_todos/templates/fir_todos/plugins/followup_main.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 <div id='fir_todos' data-url="{% url 'todos:list' incident.id %}">
 	<h2>{% trans "To-Do List" %}</h2>
-	<br style='clear:both'/>
+	<br class="separator" />
 	<div id='fir_todos_followup'>
 		{% trans "Loading ..." %}
 	</div>
diff --git a/incidents/templates/base.html b/incidents/templates/base.html
index 7ca5fb27..dbe1613a 100755
--- a/incidents/templates/base.html
+++ b/incidents/templates/base.html
@@ -39,9 +39,9 @@
               {% if request.session.can_report_event %}
               <li class="nav-item">
                 <div class="btn-group navbar-btn">
-                  <button class="btn btn-outline-danger" onclick="javascript:location.href='{% url 'events:new' %}'">
+                  <a class="btn btn-outline-danger" href="{% url 'events:new' %}">
                     {% trans "New event" %} <span class="bi bi-fire"></span>
-                  </button>
+                  </a>
                   {% if request.session.has_incident_templates %}
                   <button type="button" class="btn btn-outline-danger dropdown-toggle" data-bs-toggle="dropdown">
                     <span class="caret"></span>
diff --git a/incidents/templates/incidents/followup.html b/incidents/templates/incidents/followup.html
index ec63752b..8c499041 100755
--- a/incidents/templates/incidents/followup.html
+++ b/incidents/templates/incidents/followup.html
@@ -16,10 +16,10 @@
 
 		<div class='header'>
 			<img src="{% static "img/logo.jpg" %}" />
-			<br style='clear:both' />
+			<br class="separator" />
 			<div class='title'>
 				<h1 class='float'>{% if incident.is_incident %}{% trans "Incident followup" %}{%else%}{% trans "Event followup" %}{%endif%} [C{{incident.confidentiality}}] [{{incident.category}}] - {{incident.subject}}</h1>
-				<br style='clear:both' />
+				<br class="separator" />
                 {% trans "someone" as someone %}
 				<p>{% blocktrans with date=incident.date opened_by=incident.opened_by|default:someone %}Opened on {{ date }} by {{ opened_by }}{% endblocktrans %}</p>
 			</div>
@@ -43,7 +43,7 @@ <h1 class='float'>{% if incident.is_incident %}{% trans "Incident followup" %}{%
 		</table>
 
 
-		<br style='clear:both' />
+		<br class="separator" />
 
 
 		<div class='description'>
@@ -51,7 +51,7 @@ <h3>{% trans "Summary" %}</h3>
 			<p class='artifacts'>{{ incident.description|markdown }}</p>
 		</div>
 
-		<br style='clear:both' />
+		<br class="separator" />
 
 		<h2>{%  trans "Incident timeline" %} ({{ incident.comments_set.count }})</h2>
 
@@ -80,7 +80,7 @@ <h2>{%  trans "Incident timeline" %} ({{ incident.comments_set.count }})</h2>
 		<div class='files'>
 
 			<h2>{% trans "Related files" %}</h2>
-			<br style='clear:both'/>
+			<br class="separator" />
 			{%if incident.file_set.count > 0 %}
 				<table class='table table-condensed files' style='width:auto'>
 					{% for file in incident.file_set.all %}
diff --git a/incidents/templates/stats/quarterly.html b/incidents/templates/stats/quarterly.html
index 2e11e32b..9333bbcb 100755
--- a/incidents/templates/stats/quarterly.html
+++ b/incidents/templates/stats/quarterly.html
@@ -182,8 +182,8 @@ <h4>{% trans "Incident Management by incident leader (Business Line or CERT)" %}
 	</div>
 </div>
 
-<p class='separator' style='clear:both'>&nbsp;</p>
-<br style='clear:both' />
+<p class="separator">&nbsp;</p>
+<br class="separator" />
 
 <div style='float:left'>
 	<h4>{% trans "Monitored domains" %}</h4><br />
diff --git a/incidents/templates/stats/sandbox.html b/incidents/templates/stats/sandbox.html
index 6bb041b7..1f2e336f 100755
--- a/incidents/templates/stats/sandbox.html
+++ b/incidents/templates/stats/sandbox.html
@@ -290,7 +290,7 @@ <h1>{%  trans "Sandbox" %}</h1>
 
 </form>
 
-<br style='clear:both'>
+<br class="separator" />
 
 <div class='graph'>
   <h4>{% trans "Overlapping years" %}</h4>
@@ -298,7 +298,7 @@ <h4>{% trans "Overlapping years" %}</h4>
   </div>
 </div>
 
-<br style='clear:both'>
+<br class="separator" />
 
 <div class='graph'>
   <h4>{%  blocktrans %}By category <span class='smaller'>comparison</span>{% endblocktrans %}</h4>
@@ -306,7 +306,7 @@ <h4>{%  blocktrans %}By category <span class='smaller'>comparison</span>{% endbl
   </div>
 </div>
 
-<br style='clear:both'>
+<br class="separator" />
 
 <div class='graph'>
   <h4>{% trans "By category" %}</h4>
@@ -316,7 +316,7 @@ <h4>{% trans "By category" %}</h4>
   </div>
 </div>
 
-<br style='clear:both'>
+<br class="separator" />
 
 <div class='graph'>
   <h4>{% trans "By month" %}</h4>
@@ -324,7 +324,7 @@ <h4>{% trans "By month" %}</h4>
   </div>
 </div>
 
-<br style='clear:both'>
+<br class="separator" />
 
 <div class='graph'>
   <h4>{% trans "By subentity" %}</h4>
@@ -335,8 +335,7 @@ <h4>{% trans "By subentity" %}</h4>
 </div>
 
 
-
-<br style='clear:both'>
+<br class="separator" />
 
 <div class='graph'>
   <h4>{% trans "By severity" %}</h4>
@@ -346,7 +345,7 @@ <h4>{% trans "By severity" %}</h4>
   </div>
 </div>
 
-<br style='clear:both'>
+<br class="separator" />
 
 <div class='graph'>
   <h4>{% trans "By Incident Leader" %}</h4>
@@ -356,7 +355,7 @@ <h4>{% trans "By Incident Leader" %}</h4>
   </div>
 </div>
 
-<br style='clear:both' />
+<br class="separator" />
 
 <div class='graph'>
   <h4>{% trans "Monitored domains" %}</h4>
@@ -364,7 +363,7 @@ <h4>{% trans "Monitored domains" %}</h4>
   </div>
 </div>
 
-<br style='clear:both' />
+<br class="separator" />
 
 <div class='graph'>
   <h4>{% trans "Open incidents" %}</h4>
@@ -372,7 +371,7 @@ <h4>{% trans "Open incidents" %}</h4>
   </div>
 </div>
 
-<br style='clear:both' />
+<br class="separator" />
 
 <div class='graph'>
   <h4>{% trans "Blocked incidents" %}</h4>
@@ -380,7 +379,7 @@ <h4>{% trans "Blocked incidents" %}</h4>
   </div>
 </div>
 
-<br style='clear:both' />
+<br class="separator" />
 
 <h2>{% trans "Matching incidents" %}</h2>
 <div>Export to <a download="incidents.tsv" class="export-link" href="#" data-table="incident_table">TSV</a> or <a download="incidents.csv" class="export-link" href="#" data-table="incident_table" data-delimiter=",">CSV</a></div><br />
@@ -403,5 +402,5 @@ <h2>{% trans "Matching incidents" %}</h2>
         </tr>
       </thead>
   </table>
-<br style='clear:both' />
+<br class="separator" />
 {% endblock %}
diff --git a/incidents/templates/stats/yearly.html b/incidents/templates/stats/yearly.html
index 4e52d890..d78caaaf 100755
--- a/incidents/templates/stats/yearly.html
+++ b/incidents/templates/stats/yearly.html
@@ -65,7 +65,6 @@ <h1>{%  trans "Yearly stats" %}</h1>
 }
 
 .separator {
-  clear:both;
   margin:30px 0 30px 0;
 }
 
@@ -97,7 +96,7 @@ <h4>{% trans "Entire Group - by severity" %}</h4>
 </div>
 
 
-<p class='separator'>&nbsp;</p>
+<p class="separator">&nbsp;</p>
 
 <div class='graph'>
   <h4>{%  trans "Business Line by detection" %}</h4>
@@ -111,25 +110,25 @@ <h4>{%  trans "Incidents by business line" %}</h4>
   </div>
 </div>
 
-<p class='separator'>&nbsp;</p>
+<p class="separator">&nbsp;</p>
 
 <div class='graph'>
   <h4>{%  trans "Business Line by incident severity" %}</h4>
-  <div class='graph' id="bl_severity" style='clear:both'></div>
-  <div class='graph' id="bl_severity_bar"></div>
+  <div class="graph separator" id="bl_severity"></div>
+  <div class="graph" id="bl_severity_bar"></div>
   </div>
 
-<p class='separator'>&nbsp;</p>
+<p class="separator">&nbsp;</p>
 <div class='graph'>
   <h4>{%  trans "Business Line incident category" %}</h4>
-  <div class='graph' id="bl_category" style='clear:both'></div>
-  <div class='graph' id="bl_category_bar"></div>
+  <div class="graph separator" id="bl_category"></div>
+  <div class="graph" id="bl_category_bar"></div>
 </div>
 
-<br style='clear:both' />
+<br class="separator" />
 
-<br style='clear:both' />
-<br style='clear:both' />
+<br class="separator" />
+<br class="separator" />
 
 <script>
 
diff --git a/incidents/templates/stats/yearly_compare.html b/incidents/templates/stats/yearly_compare.html
index 15e3658b..ac58d2b8 100755
--- a/incidents/templates/stats/yearly_compare.html
+++ b/incidents/templates/stats/yearly_compare.html
@@ -149,8 +149,8 @@ <h4>{% trans "Events by business line" %} ({{year}})</h4>
 </div>
 
 
-<br style='clear:both' />
-<br style='clear:both' />
+<br class="separator" />
+<br class="separator" />
 
 <script>