diff --git a/tournaments/templates/tournaments/group_stages.html b/tournaments/templates/tournaments/group_stages.html
index ae084d7..670e096 100644
--- a/tournaments/templates/tournaments/group_stages.html
+++ b/tournaments/templates/tournaments/group_stages.html
@@ -4,9 +4,9 @@
 {% block first_title %}{{ tournament.event.display_name }}{% endblock %}
 {% block second_title %}{{ tournament.display_name }}{% endblock %}
 
-{% if tournament.display_group_stages %}
 
 {% block content %}
+{% if tournament.display_group_stages %}
 
     {% include 'tournaments/navigation_tournament.html' %}
 
@@ -20,6 +20,5 @@
     </div>
     {% endfor %}
 
+    {% endif %}
 {% endblock %}
-
-{% endif %}
diff --git a/tournaments/templates/tournaments/matches.html b/tournaments/templates/tournaments/matches.html
index f93fc75..625423e 100644
--- a/tournaments/templates/tournaments/matches.html
+++ b/tournaments/templates/tournaments/matches.html
@@ -4,9 +4,9 @@
 {% block first_title %}{{ tournament.event.display_name }}{% endblock %}
 {% block second_title %}{{ tournament.display_name }}{% endblock %}
 
-{% if tournament.display_matches %}
 {% block content %}
 
+{% if tournament.display_matches %}
 {% include 'tournaments/navigation_tournament.html' %}
 
 {% if tournament.display_matches or tournament.display_group_stages %}
@@ -44,5 +44,5 @@
 {% endfor %}
 
 {% endif %}
-{% endblock %}
 {% endif %}
+{% endblock %}
diff --git a/tournaments/templates/tournaments/prog.html b/tournaments/templates/tournaments/prog.html
index 44baf45..5342aa8 100644
--- a/tournaments/templates/tournaments/prog.html
+++ b/tournaments/templates/tournaments/prog.html
@@ -4,37 +4,37 @@
 {% block first_title %}{{ tournament.event.display_name }}{% endblock %}
 {% block second_title %}{{ tournament.display_name }}{% endblock %}
 
-{% if tournament.display_matches %}
 {% block content %}
 
-{% include 'tournaments/navigation_tournament.html' %}
+    {% if tournament.display_matches %}
+        {% include 'tournaments/navigation_tournament.html' %}
 
-{% if tournament.display_matches or tournament.display_group_stages %}
+        {% if tournament.display_matches or tournament.display_group_stages %}
 
-    {% regroup match_groups.matches by start_date|date:"l d F Y" as matches_by_date %}
+            {% regroup match_groups.matches by start_date|date:"l d F Y" as matches_by_date %}
 
-    {% for date in matches_by_date %}
+            {% for date in matches_by_date %}
 
-        {% regroup date.list by start_date|date:"H:i" as matches_by_hour %}
+                {% regroup date.list by start_date|date:"H:i" as matches_by_hour %}
 
-        {% for hour_group in matches_by_hour %}
-        <h1 class="club my-block topmargin20">{{ date.grouper }} {{ hour_group.grouper }}</h1>
+                {% for hour_group in matches_by_hour %}
+                <h1 class="club my-block topmargin20">{{ date.grouper }} {{ hour_group.grouper }}</h1>
 
-            {% regroup hour_group.list by court_index as matches_by_court %}
+                    {% regroup hour_group.list by court_index as matches_by_court %}
 
-            <div class="grid-x">
-                {% for court in matches_by_court|dictsort:"grouper" %}
-                    {% for match_data in court.list %}
-                        {% with match=match_data.match %}
-                            {% include 'tournaments/match_cell.html' %}
-                        {% endwith %}
-                    {% endfor %}
+                    <div class="grid-x">
+                        {% for court in matches_by_court|dictsort:"grouper" %}
+                            {% for match_data in court.list %}
+                                {% with match=match_data.match %}
+                                    {% include 'tournaments/match_cell.html' %}
+                                {% endwith %}
+                            {% endfor %}
+                        {% endfor %}
+                    </div>
                 {% endfor %}
-            </div>
-        {% endfor %}
-    {% endfor %}
+            {% endfor %}
 
 
-{% endif %}
+        {% endif %}
+    {% endif %}
 {% endblock %}
-{% endif %}
diff --git a/tournaments/templates/tournaments/rankings.html b/tournaments/templates/tournaments/rankings.html
index aa8fe71..5a40acf 100644
--- a/tournaments/templates/tournaments/rankings.html
+++ b/tournaments/templates/tournaments/rankings.html
@@ -4,11 +4,10 @@
 {% block first_title %}{{ tournament.event.display_name }}{% endblock %}
 {% block second_title %}{{ tournament.display_name }}{% endblock %}
 
-{% if tournament.display_rankings %}
-
 {% block content %}
 
 {% load static %}
+{% if tournament.display_rankings %}
 
     {% include 'tournaments/navigation_tournament.html' %}
 
@@ -35,6 +34,5 @@
             </div>
         </div>
     </div>
-
-{% endblock %}
 {% endif %}
+{% endblock %}
diff --git a/tournaments/templates/tournaments/summons.html b/tournaments/templates/tournaments/summons.html
index 0c35f8c..1e7ab1c 100644
--- a/tournaments/templates/tournaments/summons.html
+++ b/tournaments/templates/tournaments/summons.html
@@ -4,12 +4,11 @@
 {% block first_title %}{{ tournament.event.display_name }}{% endblock %}
 {% block second_title %}{{ tournament.display_name }}{% endblock %}
 
-{% if tournament.display_summons %}
-
 {% block content %}
 
 {% load static %}
 
+{% if tournament.display_summons %}
     {% include 'tournaments/navigation_tournament.html' %}
 
     {% if team_summons %}
@@ -35,5 +34,5 @@
 
      {% endif %}
 
-{% endblock %}
 {% endif %}
+{% endblock %}
diff --git a/tournaments/templates/tournaments/teams.html b/tournaments/templates/tournaments/teams.html
index f978b62..7a085b0 100644
--- a/tournaments/templates/tournaments/teams.html
+++ b/tournaments/templates/tournaments/teams.html
@@ -4,13 +4,11 @@
 {% block first_title %}{{ tournament.event.display_name }}{% endblock %}
 {% block second_title %}{{ tournament.display_name }}{% endblock %}
 
-{% if tournament.display_teams %}
-
 {% block content %}
-
 {% load static %}
 
-{% include 'tournaments/navigation_tournament.html' %}
+{% if tournament.display_teams == False %}
+    {% include 'tournaments/navigation_tournament.html' %}
     <div class="grid-x padding-bottom">
         <div class="cell medium-6 large-6 my-block">
             {% if selected_teams|length > 0 %}
@@ -36,5 +34,5 @@
             {% endif %}
         </div>
     </div>
-{% endblock %}
 {% endif %}
+{% endblock %}
diff --git a/tournaments/templates/tournaments/tournament_bracket.html b/tournaments/templates/tournaments/tournament_bracket.html
index eb4a7b1..7e72d08 100644
--- a/tournaments/templates/tournaments/tournament_bracket.html
+++ b/tournaments/templates/tournaments/tournament_bracket.html
@@ -4,9 +4,9 @@
 {% block first_title %}{{ tournament.event.display_name }}{% endblock %}
 {% block second_title %}{{ tournament.display_name }}{% endblock %}
 
-{% if tournament.display_matches %}
 {% block content %}
 
+{% if tournament.display_matches %}
 {% include 'tournaments/navigation_tournament.html' %}
 
 <div class="butterfly-bracket" id="bracket"></div>
@@ -288,5 +288,5 @@ function renderBracket() {
 
 </style>
 
-{% endblock %}
 {% endif %}
+{% endblock %}