diff --git a/templates/base.html b/templates/base.html
index 14817ca52..c3e477376 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -18,26 +18,8 @@
 
 {% now "Y" as now_year %} <!-- the year now as used in header text -->
 
-<div id="header"> 
-  <h1>CUCC Expeditions to Austria: 1976 - {{now_year}}</h1>
-  <div id="editLinks"> {% block loginInfo %}
-  {% if settings.DEVSERVER %}<b style="color:red; font-size:x-large">RUNNING ON LOCALSERVER</b>&nbsp;&nbsp;{% endif %}
-    <a href="/">Home</a> |
-    <a id="cuccLink" href="http://camcaving.uk/">CUCC</a> |
-    <a id="expoWebsiteLink" href="http://expo.survex.com">expo.survex</a> |
-    <a id="handbook" href="/handbook/index.htm">Handbook</a> |
-    {% if user.person %}User:(<a href="{{ user.person.get_absolute_url }}">{{ user.person }}</a>)
-		| <a href='/accounts/logout/'>Log out</a> 
-    {% elif user.username %}User:{{ user.username }}
-	    | <a href='/accounts/logout/'>Log out</a> 
-	{% else %} 
-        | <a href='/accounts/login/'>Log in</a> 
-	{% endif %}
-		| <a href='/accounts/register/'>Register</a>
-    {% endblock%}
+{% include 'headpic.html' %}
 
-   </div>
-</div>
 {% block toolbar %}{% include 'troggletoolbar.html' %}{% endblock %}	
 
     
diff --git a/templates/cavebase.html b/templates/cavebase.html
index e6854759d..bb499190a 100644
--- a/templates/cavebase.html
+++ b/templates/cavebase.html
@@ -18,6 +18,10 @@
 {% endif %}
 {% now "Y" as now_year %} <!-- the year now as used in header text -->
 <br />
+
+
+{% include 'editlinks.html' %}
+
 {% block toolbar %}{% include 'troggletoolbar.html' %}{% endblock %}
 <p>
 {% block content %}{% endblock %}
diff --git a/templates/editlinks.html b/templates/editlinks.html
new file mode 100644
index 000000000..b1d98bff1
--- /dev/null
+++ b/templates/editlinks.html
@@ -0,0 +1,17 @@
+<div id="editLinks"> {% block loginInfo %}
+  {% if settings.DEVSERVER %}<b style="color:red; font-size:x-large">RUNNING ON LOCALSERVER</b>&nbsp;&nbsp;{% endif %}
+    <a href="/">Home</a> |
+    <a id="cuccLink" href="http://camcaving.uk/">CUCC</a> |
+    <a id="expoWebsiteLink" href="http://expo.survex.com">expo.survex</a> |
+    <a id="handbook" href="/handbook/index.htm">Handbook</a> |
+    {% if user.person %}User:(<a href="{{ user.person.get_absolute_url }}">{{ user.person }}</a>)
+		| <a href='/accounts/logout/'>Log out</a> 
+    {% elif user.username %}User:{{ user.username }}
+	    | <a href='/accounts/logout/'>Log out</a> 
+	{% else %} 
+        | <a href='/accounts/login/'>Log in</a> 
+	{% endif %}
+		| <a href='/accounts/register/'>Register</a>
+    {% endblock%}
+
+   </div>
\ No newline at end of file
diff --git a/templates/headpic.html b/templates/headpic.html
new file mode 100644
index 000000000..c151f2fa9
--- /dev/null
+++ b/templates/headpic.html
@@ -0,0 +1,5 @@
+<div id="header"> 
+  <h1>CUCC Expeditions to Austria: 1976 - {{now_year}}</h1>
+  {% include 'editlinks.html' %}
+  
+</div>
\ No newline at end of file