2 files changed, 6 insertions, 17 deletions
diff --git a/templates/expobase.html b/templates/expobase.html
index 1e9c7da..cbefeb8 100644
--- a/templates/expobase.html
+++ b/templates/expobase.html
@@ -9,10 +9,10 @@
 <link rel="stylesheet" type="text/css" href="/css/main2.css" />
 {% block extrahead %}{% endblock %}
 </head>
+{% block toolbar %}
+{% if troggle %}{% include 'troggletoolbar.html' %}{% endif %}
+{% endblock %}	
 <body {% block bodyattrs %}{% endblock %}>
-{% if troggle %} 
-{% include 'troggletoolbar.html' %}
-{% endif %}
 {% block body %}{% endblock %}
 </body>
 </html>
diff --git a/templates/expopage.html b/templates/expopage.html
index e1d5ad1..2816b8e 100644
--- a/templates/expopage.html
+++ b/templates/expopage.html
@@ -2,22 +2,11 @@
 {% extends "expobase.html" %}
 {% block title %}{{ title }}{% endblock %}
 {% block bodyattrs %}{% if homepage %} id="homepage"{% endif %}{% endblock %}
-
-{% block body %}
 {% if troggle %}
-<style>
-	h2#tophead {
-		margin-top: 5px;
-		margin-bottom: 20px;
-		margin-right: -22px;
-		margin-left: 0px;		
-		}
-	h1 {
-		margin-top: 30px;
-		display: block;
-	}
-</style>
+
 {% endif %}
+{% block body %}
+
 {{ body|safe }}
 
 {% if homepage %}