diff --git a/sapl/templates/base.html b/sapl/templates/base.html
index 2a34eb34c..7bf3975ef 100644
--- a/sapl/templates/base.html
+++ b/sapl/templates/base.html
@@ -34,55 +34,68 @@
-
- {% if not request|has_iframe %}
- {% block navigation %}
-
+ {% endblock navigation %}
+ {% else %}
+
+
+ {% endif %}
+ {% endif %}
+ {% if not request|has_iframe %}
{# Header #}
{% block main_header %}
{% endblock main_header %}
- {% else %}
-