diff --git a/.gitignore b/.gitignore
index 0029b67..92ec27c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 *~
 .DS_Store
 venv/
+flask_app/venv/
diff --git a/app.py b/flask_app/app.py
similarity index 92%
rename from app.py
rename to flask_app/app.py
index 2dceb05..c3841a9 100644
--- a/app.py
+++ b/flask_app/app.py
@@ -1,6 +1,6 @@
 from flask import Flask, render_template, request
 
-app = Flask(__name__)
+app = Flask(__name__, static_folder="assets", static_url_path="/assets")
 
 
 @app.route("/")
diff --git a/flask_app/assets/css/.gitkeep b/flask_app/assets/css/.gitkeep
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/flask_app/assets/css/.gitkeep
@@ -0,0 +1 @@
+
diff --git a/flask_app/assets/img/.gitkeep b/flask_app/assets/img/.gitkeep
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/flask_app/assets/img/.gitkeep
@@ -0,0 +1 @@
+
diff --git a/flask_app/assets/js/.gitkeep b/flask_app/assets/js/.gitkeep
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/flask_app/assets/js/.gitkeep
@@ -0,0 +1 @@
+
diff --git a/templates/raetsel.html b/flask_app/templates/base.html
similarity index 68%
rename from templates/raetsel.html
rename to flask_app/templates/base.html
index b9d64f1..519d9d6 100644
--- a/templates/raetsel.html
+++ b/flask_app/templates/base.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Rätsel am Stadiontor</title>
+    <title>{% block title %}Glück Auf Stadion Escape{% endblock %}</title>
     <link href="https://fonts.googleapis.com/css2?family=Bebas+Neue&family=Barlow:wght@300;400;500&display=swap" rel="stylesheet">
     <style>
         *, *::before, *::after {
@@ -17,7 +17,7 @@
             color: #f5f8ff;
             background:
                 linear-gradient(rgba(0, 20, 60, 0.9), rgba(0, 31, 68, 0.96)),
-                radial-gradient(circle at 50% 0, rgba(122, 179, 255, 0.26), transparent 32%),
+                radial-gradient(circle at 50% 120%, rgba(255, 255, 255, 0.16), transparent 34%),
                 #001f44;
         }
 
@@ -52,12 +52,35 @@
         }
 
         main {
-            max-width: 720px;
-            margin: 0 auto;
-            padding: 4rem 1.5rem;
+            position: relative;
+            min-height: calc(100vh - 76px);
+            display: grid;
+            align-items: center;
+            padding: 4rem 3rem;
+            overflow: hidden;
+        }
+
+        main::before {
+            content: "";
+            position: absolute;
+            inset: auto 8% 0;
+            height: 42%;
+            border: 1px solid rgba(122, 179, 255, 0.22);
+            border-bottom: 0;
+            border-radius: 50% 50% 0 0;
+            opacity: 0.75;
+        }
+
+        .scene,
+        .puzzle {
+            position: relative;
+            z-index: 1;
+            max-width: 760px;
         }
 
         .puzzle {
+            width: min(720px, 100%);
+            margin: 0 auto;
             padding: 2rem;
             border: 1px solid rgba(122, 179, 255, 0.28);
             background: rgba(0, 31, 68, 0.72);
@@ -66,36 +89,51 @@
 
         h1 {
             margin-top: 0;
-            margin-bottom: 1rem;
+            margin-bottom: 1.5rem;
             font-family: "Bebas Neue", sans-serif;
-            font-size: clamp(2.6rem, 7vw, 4.8rem);
-            line-height: 0.95;
+            font-size: clamp(3rem, 8vw, 7rem);
+            line-height: 0.92;
             letter-spacing: 0.03em;
             color: #fff;
+            text-shadow: 0 4px 40px rgba(0, 80, 200, 0.7);
+        }
+
+        h1 span {
+            color: #7ab3ff;
         }
 
         p {
+            max-width: 560px;
             color: rgba(255, 255, 255, 0.68);
-            font-size: 1.02rem;
+            font-size: 1.05rem;
             font-weight: 300;
             line-height: 1.8;
         }
 
-        .clue {
+        .tag,
+        label {
+            color: rgba(255, 255, 255, 0.46);
+            font-size: 0.72rem;
+            letter-spacing: 0.2em;
+            text-transform: uppercase;
+        }
+
+        .tag {
+            margin-bottom: 1.2rem;
+        }
+
+        .clue,
+        .result {
             margin: 1.4rem 0;
             padding: 1rem 1.2rem;
             border-left: 3px solid #7ab3ff;
             background: rgba(255, 255, 255, 0.06);
-            color: rgba(255, 255, 255, 0.8);
+            color: rgba(255, 255, 255, 0.82);
         }
 
         label {
             display: block;
             margin-bottom: 0.6rem;
-            color: rgba(255, 255, 255, 0.7);
-            font-size: 0.72rem;
-            letter-spacing: 0.16em;
-            text-transform: uppercase;
         }
 
         input {
@@ -113,11 +151,11 @@
             box-shadow: 0 0 0 3px rgba(122, 179, 255, 0.12);
         }
 
-        button,
-        a {
+        .btn,
+        button {
             display: inline-block;
             margin-top: 1rem;
-            padding: 0.82rem 1.8rem;
+            padding: 0.82rem 2.2rem;
             color: #001f44;
             background: #fff;
             border: 0;
@@ -131,18 +169,16 @@
             transition: background 0.2s, color 0.2s, transform 0.15s;
         }
 
-        button:hover,
-        a:hover {
+        .btn:hover,
+        button:hover {
             color: #fff;
             background: #0057c2;
             transform: translateY(-2px);
         }
 
-        .result {
-            margin-top: 18px;
-            padding: 1rem 1.2rem;
-            border-left: 3px solid #7ab3ff;
-            background: rgba(255, 255, 255, 0.08);
+        .secondary {
+            padding-inline: 1.6rem;
+            background: rgba(255, 255, 255, 0.14);
             color: #fff;
         }
 
@@ -153,6 +189,10 @@
                 padding: 1rem 1.5rem;
             }
 
+            main {
+                padding: 3rem 1.5rem;
+            }
+
             .puzzle {
                 padding: 1.4rem;
             }
@@ -162,33 +202,11 @@
 <body>
     <nav>
         <a class="logo" href="/app/">Glück Auf</a>
-        <a href="/app/">Zurück</a>
+        <a href="/app/raetsel">Stadiontor</a>
     </nav>
 
     <main>
-        <section class="puzzle">
-            <h1>Das Stadiontor</h1>
-            <p>
-                Das Drehkreuz ist verriegelt. Über dem Eingang leuchten vier
-                blaue Markierungen: Nordkurve, Südkurve, Haupttribüne und Gegengerade.
-            </p>
-            <p class="clue">
-                Hinweis: Der Verein trägt die Vier sogar im Zeichen. Gib die Zahl ein,
-                die das Tor zum Innenraum öffnet.
-            </p>
-
-            <form method="post">
-                <label for="antwort">Code am Stadiontor</label>
-                <input id="antwort" name="antwort" required>
-                <button type="submit">Tor öffnen</button>
-            </form>
-
-            {% if ergebnis %}
-            <p class="result">{{ ergebnis }}</p>
-            {% endif %}
-
-            <p><a href="/app/">Zurück in den Gang</a></p>
-        </section>
+        {% block content %}{% endblock %}
     </main>
 </body>
 </html>
diff --git a/flask_app/templates/index.html b/flask_app/templates/index.html
new file mode 100644
index 0000000..a652534
--- /dev/null
+++ b/flask_app/templates/index.html
@@ -0,0 +1,19 @@
+{% extends "base.html" %}
+
+{% block title %}Glück Auf Stadion Escape{% endblock %}
+
+{% block content %}
+<section class="scene">
+    <p class="tag">Escape Room im Stadiongang</p>
+    <h1>Glück Auf<br><span>im Stadion</span></h1>
+    <p>
+        Der Gang unter der Tribüne ist fast leer. Aus dem Innenraum
+        dringt Flutlicht, aber das Drehkreuz zum Spielfeld bleibt gesperrt.
+    </p>
+    <p>
+        Auf einer blauen Tafel steht ein Hinweis:
+        Der erste Code steckt in der Zahl, die jeder Fan sofort erkennt.
+    </p>
+    <a class="btn" href="/app/raetsel">Zum Stadiontor</a>
+</section>
+{% endblock %}
diff --git a/flask_app/templates/raetsel.html b/flask_app/templates/raetsel.html
new file mode 100644
index 0000000..9dadaed
--- /dev/null
+++ b/flask_app/templates/raetsel.html
@@ -0,0 +1,29 @@
+{% extends "base.html" %}
+
+{% block title %}Rätsel am Stadiontor{% endblock %}
+
+{% block content %}
+<section class="puzzle">
+    <h1>Das Stadiontor</h1>
+    <p>
+        Das Drehkreuz ist verriegelt. Über dem Eingang leuchten vier
+        blaue Markierungen: Nordkurve, Südkurve, Haupttribüne und Gegengerade.
+    </p>
+    <p class="clue">
+        Hinweis: Der Verein trägt die Vier sogar im Zeichen. Gib die Zahl ein,
+        die das Tor zum Innenraum öffnet.
+    </p>
+
+    <form method="post">
+        <label for="antwort">Code am Stadiontor</label>
+        <input id="antwort" name="antwort" required>
+        <button type="submit">Tor öffnen</button>
+    </form>
+
+    {% if ergebnis %}
+    <p class="result">{{ ergebnis }}</p>
+    {% endif %}
+
+    <p><a class="btn secondary" href="/app/">Zurück in den Gang</a></p>
+</section>
+{% endblock %}
diff --git a/templates/index.html b/templates/index.html
deleted file mode 100644
index 5b46cff..0000000
--- a/templates/index.html
+++ /dev/null
@@ -1,166 +0,0 @@
-<!DOCTYPE html>
-<html lang="de">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Glück Auf Stadion Escape</title>
-    <link href="https://fonts.googleapis.com/css2?family=Bebas+Neue&family=Barlow:wght@300;400;500&display=swap" rel="stylesheet">
-    <style>
-        *, *::before, *::after {
-            box-sizing: border-box;
-        }
-
-        body {
-            margin: 0;
-            min-height: 100vh;
-            font-family: "Barlow", sans-serif;
-            color: #f5f8ff;
-            background:
-                linear-gradient(rgba(0, 20, 60, 0.88), rgba(0, 31, 68, 0.94)),
-                radial-gradient(circle at 50% 120%, rgba(255, 255, 255, 0.16), transparent 34%),
-                #001f44;
-        }
-
-        nav {
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            gap: 2rem;
-            padding: 1.2rem 2.5rem;
-            background: rgba(0, 20, 60, 0.88);
-            border-bottom: 1px solid rgba(255, 255, 255, 0.08);
-        }
-
-        .logo {
-            color: #fff;
-            font-family: "Bebas Neue", sans-serif;
-            font-size: 1.7rem;
-            letter-spacing: 0.12em;
-            text-decoration: none;
-        }
-
-        nav a:not(.logo) {
-            color: rgba(255, 255, 255, 0.52);
-            font-size: 0.82rem;
-            letter-spacing: 0.12em;
-            text-decoration: none;
-            text-transform: uppercase;
-        }
-
-        nav a:hover {
-            color: #fff;
-        }
-
-        main {
-            position: relative;
-            min-height: calc(100vh - 76px);
-            display: grid;
-            align-items: center;
-            padding: 4rem 3rem;
-            overflow: hidden;
-        }
-
-        main::before {
-            content: "";
-            position: absolute;
-            inset: auto 8% 0;
-            height: 42%;
-            border: 1px solid rgba(122, 179, 255, 0.22);
-            border-bottom: 0;
-            border-radius: 50% 50% 0 0;
-            opacity: 0.75;
-        }
-
-        .scene {
-            position: relative;
-            max-width: 760px;
-            z-index: 1;
-        }
-
-        h1 {
-            margin-top: 0;
-            margin-bottom: 1.5rem;
-            font-family: "Bebas Neue", sans-serif;
-            font-size: clamp(3.4rem, 9vw, 7rem);
-            line-height: 0.92;
-            letter-spacing: 0.03em;
-            color: #fff;
-            text-shadow: 0 4px 40px rgba(0, 80, 200, 0.7);
-        }
-
-        h1 span {
-            color: #7ab3ff;
-        }
-
-        p {
-            max-width: 560px;
-            color: rgba(255, 255, 255, 0.68);
-            font-size: 1.05rem;
-            font-weight: 300;
-            line-height: 1.8;
-        }
-
-        .tag {
-            margin-bottom: 1.2rem;
-            color: rgba(255, 255, 255, 0.46);
-            font-size: 0.72rem;
-            letter-spacing: 0.2em;
-            text-transform: uppercase;
-        }
-
-        .btn {
-            display: inline-block;
-            margin-top: 1.2rem;
-            padding: 0.82rem 2.2rem;
-            color: #001f44;
-            background: #fff;
-            text-decoration: none;
-            font-size: 0.82rem;
-            font-weight: 500;
-            letter-spacing: 0.12em;
-            text-transform: uppercase;
-            transition: background 0.2s, color 0.2s, transform 0.15s;
-        }
-
-        .btn:hover {
-            color: #fff;
-            background: #0057c2;
-            transform: translateY(-2px);
-        }
-
-        @media (max-width: 640px) {
-            nav {
-                align-items: flex-start;
-                flex-direction: column;
-                padding: 1rem 1.5rem;
-            }
-
-            main {
-                padding: 3rem 1.5rem;
-            }
-        }
-    </style>
-</head>
-<body>
-    <nav>
-        <a class="logo" href="/app/">Glück Auf</a>
-        <a href="/app/raetsel">Stadiontor</a>
-    </nav>
-
-    <main>
-        <section class="scene">
-            <p class="tag">Escape Room im Stadiongang</p>
-            <h1>Glück Auf<br><span>im Stadion</span></h1>
-            <p>
-                Der Gang unter der Tribüne ist fast leer. Aus dem Innenraum
-                dringt Flutlicht, aber das Drehkreuz zum Spielfeld bleibt gesperrt.
-            </p>
-            <p>
-                Auf einer blauen Tafel steht ein Hinweis:
-                Der erste Code steckt in der Zahl, die jeder Fan sofort erkennt.
-            </p>
-            <a class="btn" href="/app/raetsel">Zum Stadiontor</a>
-        </section>
-    </main>
-</body>
-</html>
