diff --git a/templates/cavebase.html b/templates/cavebase.html
index 1b7ebdb..e685475 100644
--- a/templates/cavebase.html
+++ b/templates/cavebase.html
@@ -4,13 +4,22 @@
 <head>
 <script>document.interestCohort = null;</script> <!-- Turn off Google FLoC -->
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>{% block title %}{{ cave.official_name|safe }}{% endblock %}
+<title>{% block headtitle %}{{ cave.official_name|safe }}{% endblock %}
 </title>
 <link rel="stylesheet" type="text/css" href="/css/main2.css" />
 
 {% block extraheaders %}{% endblock %}
 </head>
 <body>
+{% if year %}
+  {% firstof year as current_year %} 
+{% else %}
+  {% now "Y" as current_year %} <!-- the year now -->
+{% endif %}
+{% now "Y" as now_year %} <!-- the year now as used in header text -->
+<br />
+{% block toolbar %}{% include 'troggletoolbar.html' %}{% endblock %}
+<p>
 {% block content %}{% endblock %}
 {% include "menu.html" %}
 </body>
diff --git a/templates/caveindex.html b/templates/caveindex.html
index e522ada..2b8288b 100644
--- a/templates/caveindex.html
+++ b/templates/caveindex.html
@@ -1,13 +1,10 @@
 {% extends "cavebase.html" %}
 
-
 {% block title %}Cave Index{% endblock %}
 
 {% block content %}
 
 <h1>Cave Index</h1>
-
-
 <h3>Notable caves</h3>
 <ul>
 {% for cave in notablecaves %}
