diff --git a/fet2020/templates/404.html b/fet2020/templates/404.html
index 22d56ad1..e2c7e929 100644
--- a/fet2020/templates/404.html
+++ b/fet2020/templates/404.html
@@ -18,4 +18,4 @@
         </div>
     </section>
 </main>
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/admin/base.html b/fet2020/templates/admin/base.html
index 6262be3c..5a57f38c 100644
--- a/fet2020/templates/admin/base.html
+++ b/fet2020/templates/admin/base.html
@@ -1,10 +1,9 @@
 {% extends "admin/base.html" %}
-{% load i18n admin_urls %}
-{% load static %}
+{% load admin_urls i18n static %}
 
 {% block extrahead %}
     <link rel="shortcut icon" type="image/png" href="{% static 'img/fet_logo_white.png' %}"/>
-{% endblock %}
+{% endblock extrahead %}
 
 {% block usertools %}
 {% if has_permission %}
@@ -12,14 +11,14 @@
     {% block welcome-msg %}
         {% translate 'Welcome,' %}
         <strong>{% firstof user.get_short_name user.get_username %}</strong>.
-    {% endblock %}
+    {% endblock welcome-msg %}
     {% block userlinks %}
         {% if site_url %}
             <a class="button" href="{{ site_url }}">Zurück zur FET Homepage</a>
         {% endif %}
         <!-- TODO: FIXME: <a class="button" href="{% url 'authentications:password_change' %}">Passwort ändern</a> -->
         <a class="button" href="{% url 'admin:logout' %}">{% translate 'Log out' %}</a>
-    {% endblock %}
+    {% endblock userlinks %}
 </div>
 {% endif %}
-{% endblock %}
+{% endblock usertools %}
diff --git a/fet2020/templates/admin/base_site.html b/fet2020/templates/admin/base_site.html
index c7b85356..dd7a13db 100644
--- a/fet2020/templates/admin/base_site.html
+++ b/fet2020/templates/admin/base_site.html
@@ -1,3 +1,3 @@
 {% extends "admin/base_site.html" %}
 
-{% block title %}{{ site_title }}: {{ title }} {% endblock %}
+{% block title %}{{ site_title }}: {{ title }}{% endblock %}
diff --git a/fet2020/templates/admin/change_form.html b/fet2020/templates/admin/change_form.html
index 6769f39c..bb75124d 100644
--- a/fet2020/templates/admin/change_form.html
+++ b/fet2020/templates/admin/change_form.html
@@ -1,6 +1,6 @@
 {% extends "admin/change_form.html" %}
-{% load i18n admin_urls %}
+{% load admin_urls i18n %}
 
 {% block form_top %}
 {% if help_text %}<p>{{ help_text }}</p>{% endif %}
-{% endblock %}
+{% endblock form_top %}
diff --git a/fet2020/templates/admin/submit_line.html b/fet2020/templates/admin/submit_line.html
index 1549624f..ec1e5bda 100644
--- a/fet2020/templates/admin/submit_line.html
+++ b/fet2020/templates/admin/submit_line.html
@@ -1,5 +1,5 @@
 {% extends "admin/submit_line.html" %}
-{% load i18n admin_urls %}
+{% load admin_urls i18n %}
 
 {% block submit-row %}
     {% if not show_close %}
@@ -8,4 +8,4 @@
     {% endif %}
     {% if generate_pdf %}<input type="submit" value="PDF File generieren" class="default" name="_generate_pdf">{% endif %}
     {{ block.super }}
-{% endblock %}
+{% endblock submit-row %}
diff --git a/fet2020/templates/authentications/change_password.html b/fet2020/templates/authentications/change_password.html
index b60cd7bd..1d9fd004 100644
--- a/fet2020/templates/authentications/change_password.html
+++ b/fet2020/templates/authentications/change_password.html
@@ -26,4 +26,4 @@
 			</form>
 		</div>
 	</main>
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/authentications/change_password_done.html b/fet2020/templates/authentications/change_password_done.html
index fc349959..6c4ad377 100644
--- a/fet2020/templates/authentications/change_password_done.html
+++ b/fet2020/templates/authentications/change_password_done.html
@@ -12,4 +12,4 @@
         </div>
 
 	</main>
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/authentications/login.html b/fet2020/templates/authentications/login.html
index df9b14b2..956c175a 100644
--- a/fet2020/templates/authentications/login.html
+++ b/fet2020/templates/authentications/login.html
@@ -28,4 +28,4 @@
 			</form>
 		</div>
 	</main>
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/base.html b/fet2020/templates/base.html
index c77a7ee1..3eef34f7 100644
--- a/fet2020/templates/base.html
+++ b/fet2020/templates/base.html
@@ -1,6 +1,4 @@
-{% load flatpages %}
-{% load static %}
-{% load version %}
+{% load flatpages static version %}
 
 <!DOCTYPE html>
 <html lang="de" x-data="bodyData" x-bind="documentRoot">
@@ -50,9 +48,9 @@
         <link rel="stylesheet" href="{% static 'fonts/Fira_Code-6.2/fira_code.css' %}">
 
         {% block galleryheader %}
-        {% endblock %}
+        {% endblock galleryheader %}
         {% block extraheader %}
-        {% endblock %}
+        {% endblock extraheader %}
     </head>
 
     <body x-bind="documentBody">
@@ -203,7 +201,7 @@
         </nav>
 
         {% block content %}
-        {% endblock %}
+        {% endblock content %}
 
         <footer>
             <ul class="icon-list">
diff --git a/fet2020/templates/blackboard/index.html b/fet2020/templates/blackboard/index.html
index 7a14db6c..b811acdc 100644
--- a/fet2020/templates/blackboard/index.html
+++ b/fet2020/templates/blackboard/index.html
@@ -75,4 +75,4 @@
             {% endif %}
 		</div>
 	</main>
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/documents/base.html b/fet2020/templates/documents/base.html
index a7a7b388..0b143774 100644
--- a/fet2020/templates/documents/base.html
+++ b/fet2020/templates/documents/base.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html>
 {% load i18n %}
 <html lang="en">
@@ -14,10 +13,10 @@
   <div id="nav"><nav>
     {% block nav %}
       {% if user.is_authenticated %}
-      <a class="nav" href="/accounts/profile/">{% trans "profile" %}</a>
-      <a class="nav" href="/logout">{% trans "logout" %}</a>
+      <a class="nav" href="/accounts/profile/">{% translate "profile" %}</a>
+      <a class="nav" href="/logout">{% translate "logout" %}</a>
       {% endif %}
-    {% endblock %}
+    {% endblock nav %}
   </nav></div>
   <div id="wrapper">
   {% block wrapper %}
@@ -31,7 +30,7 @@
             <span class="mark">!</span>{{ message.text }}<span class="mark">!</span>
           </div>
           {% endfor %}
-          {% endblock %}
+          {% endblock messages %}
           </div>
         {% endif %}
         {% block content %}{% endblock %}
@@ -42,9 +41,8 @@
       <div id="footer"><footer>
       </footer></div>
     </div>
-  {% endblock %}
+  {% endblock wrapper %}
   </div>
 
 </body>
 </html>
-
diff --git a/fet2020/templates/documents/pad.html b/fet2020/templates/documents/pad.html
index bc342cf1..48ff3661 100644
--- a/fet2020/templates/documents/pad.html
+++ b/fet2020/templates/documents/pad.html
@@ -1,18 +1,17 @@
 {% extends "documents/base.html" %}
 
-
-{% block title %}{{pad.name}}{% endblock %}
+{% block title %}{{ pad.name }}{% endblock %}
 
 {% block wrapper %}
   {% if error %}
   <div id="main">
     <div id="errors">
       <h2>Errors:</h2>
-      <p>{{error}}</p>
+      <p>{{ error }}</p>
     </div>
   </div>
   {% else %}
-  <iframe src="{{link}}?userName={{uname}}" style="height: 95%; width: 100%; min-height: 500px; display: block"></iframe>
+  <iframe src="{{ link }}?userName={{ uname }}" style="height: 95%; width: 100%; min-height: 500px; display: block"></iframe>
 
   <script type="text/javascript">
   /**
@@ -31,4 +30,4 @@
   </script>
   {% endif %}
 
-{% endblock %}
\ No newline at end of file
+{% endblock wrapper %}
diff --git a/fet2020/templates/finance/bill_create.html b/fet2020/templates/finance/bill_create.html
index cf76006b..e5d6723d 100644
--- a/fet2020/templates/finance/bill_create.html
+++ b/fet2020/templates/finance/bill_create.html
@@ -103,4 +103,4 @@
         </section>
     </form>
 </main>
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/finance/bill_create_done.html b/fet2020/templates/finance/bill_create_done.html
index 0c27efb5..5ce9d9ec 100644
--- a/fet2020/templates/finance/bill_create_done.html
+++ b/fet2020/templates/finance/bill_create_done.html
@@ -6,10 +6,10 @@
 <!-- Main Content -->
 <main class="container mx-auto w-full px-4 my-8 flex-1">
     <section class="w-full text-center">
-        <p class="mt-6 text-gray-900 dark:text-gray-100">Rechnung #{{pk}} wurde erfolgreich eingereicht.</p>
+        <p class="mt-6 text-gray-900 dark:text-gray-100">Rechnung #{{ pk }} wurde erfolgreich eingereicht.</p>
         <div class="mt-10 flex items-center justify-center">
             <a href="{% url 'home' %}" type="submit" class="block btn btn-primary">Zur Startseite</a>
         </div>
     </section>
 </main>
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/finance/bill_update.html b/fet2020/templates/finance/bill_update.html
index f09f0782..bc8f47b0 100644
--- a/fet2020/templates/finance/bill_update.html
+++ b/fet2020/templates/finance/bill_update.html
@@ -178,4 +178,4 @@
         {% endif %}
     </form>
 </main>
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/finance/index.html b/fet2020/templates/finance/index.html
index 819815b2..dbf1cf84 100644
--- a/fet2020/templates/finance/index.html
+++ b/fet2020/templates/finance/index.html
@@ -71,4 +71,4 @@
         </div>
     </div>
 </main>
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/finance/resolution_create.html b/fet2020/templates/finance/resolution_create.html
index a25e00bc..f96b6d4a 100644
--- a/fet2020/templates/finance/resolution_create.html
+++ b/fet2020/templates/finance/resolution_create.html
@@ -35,4 +35,4 @@
         </section>
     </form>
 </main>
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/finance/resolution_detail.html b/fet2020/templates/finance/resolution_detail.html
index 8a25af81..fc5543ba 100644
--- a/fet2020/templates/finance/resolution_detail.html
+++ b/fet2020/templates/finance/resolution_detail.html
@@ -57,4 +57,4 @@
         </a>
     </section>
 </main>
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/finance/resolution_list.html b/fet2020/templates/finance/resolution_list.html
index 3f2db6d4..e138dae4 100644
--- a/fet2020/templates/finance/resolution_list.html
+++ b/fet2020/templates/finance/resolution_list.html
@@ -27,7 +27,7 @@
                     {% for result in object_list %}
                         <tr>
                             <td class="text-right">{{ result.id }}</td>
-                            <td class="text-blue-700 dark:text-blue-200 no-underline hover:underline"><a href="{%url 'finance:resolution_detail' result.id %}">{{ result.name }}</a></td>
+                            <td class="text-blue-700 dark:text-blue-200 no-underline hover:underline"><a href="{% url 'finance:resolution_detail' result.id %}">{{ result.name }}</a></td>
                             <!--<td class="text-left">{{ result.voting_text|truncatechars:300 }}</td>-->
                             <td class="text-left">{{ result.voting }}</td>
                             <td class="text-left">{{ result.get_option_display }}</td>
@@ -65,4 +65,4 @@
         {% endif %}
     </div>
 </main>
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/finance/resolution_update.html b/fet2020/templates/finance/resolution_update.html
index 0d6b79d5..7b17e632 100644
--- a/fet2020/templates/finance/resolution_update.html
+++ b/fet2020/templates/finance/resolution_update.html
@@ -35,4 +35,4 @@
         </section>
     </form>
 </main>
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/flatpages/default.html b/fet2020/templates/flatpages/default.html
index 9b0bec9a..a0e10175 100644
--- a/fet2020/templates/flatpages/default.html
+++ b/fet2020/templates/flatpages/default.html
@@ -17,4 +17,4 @@
             </div>
         {% endif %}
 	</main>
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/flatpages/social_media.html b/fet2020/templates/flatpages/social_media.html
index 2a658dfb..93d17204 100644
--- a/fet2020/templates/flatpages/social_media.html
+++ b/fet2020/templates/flatpages/social_media.html
@@ -77,4 +77,4 @@
             </main>
         </div>
     </body>
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/gallery/album.html b/fet2020/templates/gallery/album.html
index 5557eec8..ffc6f3c9 100644
--- a/fet2020/templates/gallery/album.html
+++ b/fet2020/templates/gallery/album.html
@@ -5,7 +5,7 @@
 
 {% block galleryheader %}
     <link rel="stylesheet" href="{% static 'Gallery-3.4.0/css/blueimp-gallery.min.css' %}">
-{% endblock %}
+{% endblock galleryheader %}
 
 {% block content %}
 <!-- Main Content -->
@@ -77,4 +77,4 @@
   }
 </script>
 
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/gallery/index.html b/fet2020/templates/gallery/index.html
index acb4e55a..c79d644e 100644
--- a/fet2020/templates/gallery/index.html
+++ b/fet2020/templates/gallery/index.html
@@ -31,4 +31,4 @@
         {% endfor %}
     </div>
 </main>
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/home.html b/fet2020/templates/home.html
index e9d5dcd2..8d22a418 100644
--- a/fet2020/templates/home.html
+++ b/fet2020/templates/home.html
@@ -121,4 +121,4 @@
         </section>
     </div>
 </main>      
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/intern/attachment/create.html b/fet2020/templates/intern/attachment/create.html
index ea8e86f0..8d79ddbc 100644
--- a/fet2020/templates/intern/attachment/create.html
+++ b/fet2020/templates/intern/attachment/create.html
@@ -20,4 +20,4 @@
         </form>
     </div>
 </main>
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/intern/attachment/detail.html b/fet2020/templates/intern/attachment/detail.html
index ced9efc8..88216338 100644
--- a/fet2020/templates/intern/attachment/detail.html
+++ b/fet2020/templates/intern/attachment/detail.html
@@ -61,4 +61,4 @@
         <a href="{% url 'intern:attachment_update' attachment.topic.topic_group.slug attachment.topic.slug attachment.slug %}" class="btn btn-primary block place-self-end"><i class="fa-solid fa-pen-to-square mr-2"></i>Beschreibung bearbeiten</a>
     </div>
 </main>
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/intern/attachment/update.html b/fet2020/templates/intern/attachment/update.html
index 68cf4a36..36e694e9 100644
--- a/fet2020/templates/intern/attachment/update.html
+++ b/fet2020/templates/intern/attachment/update.html
@@ -20,4 +20,4 @@
         </form>
     </div>
 </main>
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/intern/etherpad/create.html b/fet2020/templates/intern/etherpad/create.html
index abca8eaa..d0c2237d 100644
--- a/fet2020/templates/intern/etherpad/create.html
+++ b/fet2020/templates/intern/etherpad/create.html
@@ -20,4 +20,4 @@
         </form>
     </div>
 </main>
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/intern/fileupload/create.html b/fet2020/templates/intern/fileupload/create.html
index 09c4a6f0..318fefa8 100644
--- a/fet2020/templates/intern/fileupload/create.html
+++ b/fet2020/templates/intern/fileupload/create.html
@@ -20,4 +20,4 @@
         </form>
     </div>
 </main>
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/intern/index.html b/fet2020/templates/intern/index.html
index 418dd846..7fd13142 100644
--- a/fet2020/templates/intern/index.html
+++ b/fet2020/templates/intern/index.html
@@ -92,4 +92,4 @@
         <a href="{% url 'admin:intern_topicgroup_add' %}" class="btn btn-primary block w-full"><i class="fa-solid fa-plus-square mr-2"></i>Neuer Themenbereich</a>
     </div>
 </main>
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/intern/topic/create.html b/fet2020/templates/intern/topic/create.html
index ad18b9d8..0866a255 100644
--- a/fet2020/templates/intern/topic/create.html
+++ b/fet2020/templates/intern/topic/create.html
@@ -20,4 +20,4 @@
         </form>
     </div>
 </main>
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/intern/topic/detail.html b/fet2020/templates/intern/topic/detail.html
index 46b0a21f..0d0aaab7 100644
--- a/fet2020/templates/intern/topic/detail.html
+++ b/fet2020/templates/intern/topic/detail.html
@@ -36,4 +36,4 @@
         </section>
     </div>
 </main>
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/intern/topic/update.html b/fet2020/templates/intern/topic/update.html
index 72516f93..0f21a02b 100644
--- a/fet2020/templates/intern/topic/update.html
+++ b/fet2020/templates/intern/topic/update.html
@@ -24,4 +24,4 @@
         </form>
     </div>
 </main>
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/members/index.html b/fet2020/templates/members/index.html
index 4722885f..98745b3b 100644
--- a/fet2020/templates/members/index.html
+++ b/fet2020/templates/members/index.html
@@ -1,9 +1,6 @@
 {% extends 'base.html' %}
 
-{% load flatpages %}
-{% load job_groups %}
-{% load softhyphen_tags %}
-{% load static %}
+{% load flatpages job_groups softhyphen_tags static %}
 
 {% block content %}
 <!-- Main Content -->
@@ -106,21 +103,21 @@
                 {% if member %}
                     <!-- show details of a member -->
                     {% block member_content %}
-                    {% endblock %}
+                    {% endblock member_content %}
                 {% endif %}
 
                 {% if members %}
                     <!-- show all, active or pension members -->
                     {% block members_content %}
-                    {% endblock %}
+                    {% endblock members_content %}
                 {% endif %}
 
                 {% if job_members %}
                     <!-- show job lists in a job group -->
                     {% block jobs_content %}
-                    {% endblock %}
+                    {% endblock jobs_content %}
                 {% endif %}
         </section>
     </div>
 </main>
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/members/jobs.html b/fet2020/templates/members/jobs.html
index 9a6ad52c..4fc76b65 100644
--- a/fet2020/templates/members/jobs.html
+++ b/fet2020/templates/members/jobs.html
@@ -36,4 +36,4 @@
             </article>
         {% endfor %}
     </div>
-{% endblock %}
+{% endblock jobs_content %}
diff --git a/fet2020/templates/members/member.html b/fet2020/templates/members/member.html
index c11f6495..d24c461a 100644
--- a/fet2020/templates/members/member.html
+++ b/fet2020/templates/members/member.html
@@ -9,7 +9,7 @@
     <meta content="{{ member.firstname }}" property="og:profile:first_name">
     <meta content="{{ member.surname }}" property="og:profile:last_name">
     <meta content="profile" property="og:type">
-{% endblock %}
+{% endblock extraheader %}
 
 {% block member_content %}
     <section class="flex-grow w-full max-w-prose my-8 sm:my-0 text-gray-800 dark:text-gray-300">
@@ -70,4 +70,4 @@
             </div>
         {% endif %}
     </section>
-{% endblock %}
+{% endblock member_content %}
diff --git a/fet2020/templates/members/members.html b/fet2020/templates/members/members.html
index 51f9bebe..cc4d5c07 100644
--- a/fet2020/templates/members/members.html
+++ b/fet2020/templates/members/members.html
@@ -26,4 +26,4 @@
             {% endfor %}
         </div>
     </article>
-{% endblock %}
+{% endblock members_content %}
diff --git a/fet2020/templates/posts/event/detail.html b/fet2020/templates/posts/event/detail.html
index 262f9072..49516fcb 100644
--- a/fet2020/templates/posts/event/detail.html
+++ b/fet2020/templates/posts/event/detail.html
@@ -5,9 +5,11 @@
 {% block title %}{{ post.title }}{% endblock %}
 
 {% block prev_text_big %}Vorheriges<br>Event{% endblock %}
+
 {% block next_text_big %}Nächstes<br>Event{% endblock %}
 
 {% block prev_text %}Vorheriges Event{% endblock %}
+
 {% block next_text %}Nächstes Event{% endblock %}
 
 {% block update_button_desktop %}
@@ -16,7 +18,7 @@
             <i class="fa-solid fa-pen-to-square mr-1"></i>Event bearbeiten
         </a>
     {% endif %}
-{% endblock %}
+{% endblock update_button_desktop %}
 
 {% block event_details_desktop %}
     <div class="hidden lg:block absolute top-0 right-0 bg-white dark:bg-gray-950 rounded-bl p-2 bg-opacity-60 dark:bg-opacity-60 gap-2 backdrop-blur">
@@ -46,13 +48,13 @@
             {% endif %}
         </span>
     </div>
-{% endblock %}
+{% endblock event_details_desktop %}
 
 {% block post_body %}
     {% if post.body %}
         {{ post.body|safe|tags_to_url }}
     {% endif %}
-{% endblock %}
+{% endblock post_body %}
 
 {% block event_details_mobile %}
     <hr class="lg:hidden -mx-4 border-gray-200 dark:border-gray-800 dark:border my-4">
@@ -66,7 +68,7 @@
             {% endif %}
         </ul>
     </div>
-{% endblock %}
+{% endblock event_details_mobile %}
 
 {% block update_button_mobile %}
     {% if request.user.is_authenticated %}
@@ -74,4 +76,4 @@
             <i class="fa-solid fa-pen-to-square mr-1"></i>Event bearbeiten
         </a>
     {% endif %}
-{% endblock %}
+{% endblock update_button_mobile %}
diff --git a/fet2020/templates/posts/event/update.html b/fet2020/templates/posts/event/update.html
index 77e8667b..b710c468 100644
--- a/fet2020/templates/posts/event/update.html
+++ b/fet2020/templates/posts/event/update.html
@@ -27,4 +27,4 @@
         </form>
     </div>
 </main>
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/posts/fetmeeting/create.html b/fet2020/templates/posts/fetmeeting/create.html
index 8f1d0ca6..6decd8ae 100644
--- a/fet2020/templates/posts/fetmeeting/create.html
+++ b/fet2020/templates/posts/fetmeeting/create.html
@@ -26,4 +26,4 @@
         </form>
     </div>
 </main>
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/posts/fetmeeting/detail.html b/fet2020/templates/posts/fetmeeting/detail.html
index b6810aa4..f5a3beb7 100644
--- a/fet2020/templates/posts/fetmeeting/detail.html
+++ b/fet2020/templates/posts/fetmeeting/detail.html
@@ -5,9 +5,11 @@
 {% block title %}{{ post.title }} vom {{ post.event_start|date }}{% endblock %}
 
 {% block prev_text_big %}Vorherige<br>Sitzung{% endblock %}
+
 {% block next_text_big %}Nächste<br>Sitzung{% endblock %}
 
 {% block prev_text %}Vorherige Sitzung{% endblock %}
+
 {% block next_text %}Nächste Sitzung{% endblock %}
 
 {% block update_button_desktop %}
@@ -16,7 +18,7 @@
             <i class="fa-solid fa-pen-to-square mr-1"></i>FET Sitzung bearbeiten
         </a>
     {% endif %}
-{% endblock %}
+{% endblock update_button_desktop %}
 
 {% block event_details_desktop %}
     <div class="hidden lg:block absolute top-0 right-0 bg-white dark:bg-gray-950 rounded-bl p-2 bg-opacity-60 dark:bg-opacity-60 gap-2 backdrop-blur">
@@ -46,7 +48,7 @@
             {% endif %}
         </span>
     </div>
-{% endblock %}
+{% endblock event_details_desktop %}
 
 {% block post_body %}
     {% if post.has_agenda and post.agenda_html %}
@@ -59,7 +61,7 @@
         <h2>Protokoll</h2>
         {{ post.protocol_html|safe }}
     {% endif %}
-{% endblock %}
+{% endblock post_body %}
 
 {% block event_details_mobile %}
     <hr class="lg:hidden -mx-4 border-gray-200 dark:border-gray-800 dark:border my-4">
@@ -73,7 +75,7 @@
             {% endif %}
         </ul>
     </div>
-{% endblock %}
+{% endblock event_details_mobile %}
 
 {% block docu_buttons %}
     {% if request.user.is_authenticated %}
@@ -176,7 +178,7 @@
             </div>
         </div>
     {% endif %}
-{% endblock %}
+{% endblock docu_buttons %}
 
 {% block update_button_mobile %}
     {% if request.user.is_authenticated %}
@@ -184,4 +186,4 @@
             <i class="fa-solid fa-pen-to-square mr-1"></i>FET Sitzung bearbeiten
         </a>
     {% endif %}
-{% endblock %}
+{% endblock update_button_mobile %}
diff --git a/fet2020/templates/posts/fetmeeting/update.html b/fet2020/templates/posts/fetmeeting/update.html
index 9c618e87..44249f4e 100644
--- a/fet2020/templates/posts/fetmeeting/update.html
+++ b/fet2020/templates/posts/fetmeeting/update.html
@@ -25,4 +25,4 @@
         </form>
     </div>
 </main>
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/posts/index.html b/fet2020/templates/posts/index.html
index 97a62b59..b5ef965f 100644
--- a/fet2020/templates/posts/index.html
+++ b/fet2020/templates/posts/index.html
@@ -116,4 +116,4 @@
         </section>
     </div>
 </main>
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/posts/news/detail.html b/fet2020/templates/posts/news/detail.html
index 0ae4eec3..db3aa1fb 100644
--- a/fet2020/templates/posts/news/detail.html
+++ b/fet2020/templates/posts/news/detail.html
@@ -10,13 +10,13 @@
             <i class="fa-solid fa-pen-to-square mr-1"></i>Artikel bearbeiten
         </a>
     {% endif %}
-{% endblock %}
+{% endblock update_button_desktop %}
 
 {% block post_body %}
     {% if post.body %}
         {{ post.body|safe|tags_to_url }}
     {% endif %}
-{% endblock %}
+{% endblock post_body %}
 
 {% block files_buttons %}
     {% if files %}
@@ -51,7 +51,7 @@
             </div>
         {% endfor %}
     {% endif %}
-{% endblock %}
+{% endblock files_buttons %}
 
 {% block update_button_mobile %}
     {% if request.user.is_authenticated %}
@@ -59,4 +59,4 @@
             <i class="fa-solid fa-pen-to-square mr-1"></i>Artikel bearbeiten
         </a>
     {% endif %}
-{% endblock %}
+{% endblock update_button_mobile %}
diff --git a/fet2020/templates/posts/news/update.html b/fet2020/templates/posts/news/update.html
index 64934064..533475c4 100644
--- a/fet2020/templates/posts/news/update.html
+++ b/fet2020/templates/posts/news/update.html
@@ -23,4 +23,4 @@
         </form>
     </div>
 </main>
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/posts/show.html b/fet2020/templates/posts/show.html
index 364b72b7..9eab79ee 100644
--- a/fet2020/templates/posts/show.html
+++ b/fet2020/templates/posts/show.html
@@ -7,7 +7,7 @@
     <meta content="{{ post.title }}" property="og:title">
     <meta content="article" property="og:type">
     <meta content="" property="og:url">
-{% endblock %}
+{% endblock extraheader %}
 
 {% block content %}
 <!-- Main Content -->
@@ -81,12 +81,12 @@
                 </div>
 
                 {% block update_button_desktop %}
-                {% endblock %}
+                {% endblock update_button_desktop %}
             </div>
         </div>
         <div class="relative w-full h-44 sm:h-56 md:h-60 lg:h-64 xl:h-96 bg-center bg-no-repeat bg-cover sm:rounded-md mx-auto" style="background-image: url('{{ post.imageurl }}');">
             {% block event_details_desktop %}
-            {% endblock %}
+            {% endblock event_details_desktop %}
         </div>
     </section>
     <section class="mx-4 z-10">
@@ -94,17 +94,17 @@
             <div class="db-page-content-left">
                 <!-- Content from DB here: -->
                 {% block post_body %}
-                {% endblock %}
+                {% endblock post_body %}
             </div>
 
             {% block event_details_mobile %}
-            {% endblock %}
+            {% endblock event_details_mobile %}
             
             {% block docu_buttons %}
-            {% endblock %}
+            {% endblock docu_buttons %}
 
             {% block files_buttons %}
-            {% endblock %}
+            {% endblock files_buttons %}
 
             <hr class="-mx-4 border-gray-200 dark:border-gray-800 dark:border my-4">
             <div class="-m-4 flex divide-x divide-gray-200 dark:divide-gray-800 dark:divide-x-2 text-sm sm:text-base">
@@ -120,7 +120,7 @@
         </article>
 
         {% block update_button_mobile %}
-        {% endblock %}
+        {% endblock update_button_mobile %}
     </section>
 
     {% if related_posts and related_posts|length > 1 %}
@@ -146,4 +146,4 @@
         </section>
     {% endif %}
 </main>
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/posts/tag.html b/fet2020/templates/posts/tag.html
index 043cb86a..5b06a886 100644
--- a/fet2020/templates/posts/tag.html
+++ b/fet2020/templates/posts/tag.html
@@ -14,4 +14,4 @@
         </section>
     </div>
 </main>
-{% endblock %}
+{% endblock content %}
diff --git a/fet2020/templates/search/index.html b/fet2020/templates/search/index.html
index 593e5d7d..cd92bdd2 100644
--- a/fet2020/templates/search/index.html
+++ b/fet2020/templates/search/index.html
@@ -45,4 +45,4 @@
         {% endif %}
     </section>
 </main>
-{% endblock %}
+{% endblock content %}