diff --git a/templates/base.html b/templates/base.html
index 27a78df..14817ca 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -38,6 +38,7 @@
 
    </div>
 </div>
+{% block toolbar %}{% include 'troggletoolbar.html' %}{% endblock %}	
 
     
 <div id="nav">
@@ -55,7 +56,6 @@
         {% block related %}
         {% endblock %}
     </div>
-	{% include 'troggletoolbar.html' %}
     {% block content %}
     REPLACE : The content
     {% endblock %}
diff --git a/templates/troggletoolbar.html b/templates/troggletoolbar.html
index 53f9ea0..24d5254 100644
--- a/templates/troggletoolbar.html
+++ b/templates/troggletoolbar.html
@@ -1,11 +1,25 @@
-<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/trog3.css" title="troggle-style"/>
+<style>
+.toolbarlinks
+{
+    padding:5px;
+    background-color:#9ff;
+    text-align:center;
+    font-weight:bold; 
+}
+.toolbarlinkslocal
+{
+    padding:5px;
+    background-color:#f9f;
+    text-align:center;
+    font-weight:bold; 
+}
+</style>
 {% if settings.DEVSERVER %}
 <div class="toolbarlinkslocal">
 {% else %}
 <div class="toolbarlinks">
 {% endif %}
     <a href="/logbookedit/">Logbook Entry</a> |
-    <!--<a href="/1626/359/359.html">359 (HC)</a> |-->
     <a id="cavesLink" href="/caves">Caves</a>  |
     <a id="qmsLink" href="{% url "caveQMs" "1623-290" %}">QMs</a>  |
     <a href="/survexfile/">Survex</a> |