diff --git a/fet2020/templates/flatpages/default.html b/fet2020/templates/flatpages/default.html
index d1744e19..7079942b 100644
--- a/fet2020/templates/flatpages/default.html
+++ b/fet2020/templates/flatpages/default.html
@@ -1,13 +1,18 @@
-{% extends 'layout.html' %}
+{% extends 'base.html' %}
+
 {% block content %}
-
-<div class="grid-container padding-top-1">
-{% if request.user.is_authenticated %}
-    <a href="{% url 'admin:core_customflatpage_change' flatpage.id %}">Diese Seite bearbeiten</a>
-    <hr>
-{% endif %}
-
-{{ flatpage.content }}
-</div>
-
+	<!-- Main Content -->
+	<main class="container mx-auto w-full px-4 my-8 flex-1">
+		<h1 class="page-title">{{ flatpage.title }}</h1>
+		<div class="db-page-content-left max-w-4xl mx-auto">
+            {{ flatpage.content }}
+        </div>
+        {% if request.user.is_authenticated %}
+            <div class="max-w-4xl mx-auto mt-8 flex justify-end">
+                <a href="{% url 'admin:core_customflatpage_change' flatpage.id %}" class="btn-small btn-primary w-full sm:w-auto">
+                    <i class="fa-regular fa-memo mr-2"></i>Seite bearbeiten
+                </a>
+            </div>
+        {% endif %}
+	</main>
 {% endblock %}