diff --git a/templates/expobase.html b/templates/expobase.html
index cbefeb89f..8acf37eb8 100644
--- a/templates/expobase.html
+++ b/templates/expobase.html
@@ -1,4 +1,3 @@
-
{% autoescape off %}
diff --git a/templates/expopage.html b/templates/expopage.html
index 2816b8ef7..1be325d25 100644
--- a/templates/expopage.html
+++ b/templates/expopage.html
@@ -1,12 +1,9 @@
+
{% extends "expobase.html" %}
{% block title %}{{ title }}{% endblock %}
{% block bodyattrs %}{% if homepage %} id="homepage"{% endif %}{% endblock %}
-{% if troggle %}
-
-{% endif %}
{% block body %}
-
{{ body|safe }}
{% if homepage %}