diff --git a/app/templates/index.html b/app/templates/index.html
index a1a077e..074e5ca 100644
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -3,45 +3,66 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Vokabeltrainer Englisch 6a</title>
+    <title>Vokabeltrainer 6a</title>
     <link rel="stylesheet" href="/static/style.css">
 </head>
 <body>
     <div class="container">
-        <h1>Vokabeltrainer</h1>
+        <h1>Vokabeltrainer 6a</h1>
 
         <div id="setup-screen">
-            <div class="mode-select">
-                <button onclick="setMode('de-en')" id="btn-de-en">Deutsch -> Englisch</button>
-                <button onclick="setMode('en-de')" id="btn-en-de">Englisch -> Deutsch</button>
-                <button onclick="setMode('random')" id="btn-random" class="active">Zufällig</button>
-                <button onclick="setMode('irregular')" id="btn-irregular" style="border-color: #ff9800; color: #e65100;">Unregelmäßige Verben</button>
+            
+            <div class="section-title">1. Was lernen wir?</div>
+            <div class="button-group">
+                <button onclick="selectMainMode('vocab')" id="btn-main-vocab" class="mode-btn">Vokabeln</button>
+                <button onclick="selectMainMode('irregular')" id="btn-main-irregular" class="mode-btn special-btn">Unregelmäßige Verben</button>
+            </div>
+
+            <div id="submode-vocab" class="submode-container" style="display:none;">
+                <div class="section-title">2. Welche Richtung?</div>
+                <div class="button-group">
+                    <button onclick="selectSubMode('de-en')" class="sub-btn" id="btn-sub-de-en">Deutsch -> Englisch</button>
+                    <button onclick="selectSubMode('en-de')" class="sub-btn" id="btn-sub-en-de">Englisch -> Deutsch</button>
+                    <button onclick="selectSubMode('random')" class="sub-btn" id="btn-sub-random">Zufällig</button>
+                </div>
+            </div>
+
+            <div id="submode-irregular" class="submode-container" style="display:none;">
+                <div class="section-title">2. Wie abfragen?</div>
+                <div class="button-group">
+                    <button onclick="selectSubMode('start-inf')" class="sub-btn" id="btn-sub-start-inf">Gegeben: Infinitiv<br><small>(Suche: Past & Participle)</small></button>
+                    <button onclick="selectSubMode('start-german')" class="sub-btn" id="btn-sub-start-german">Gegeben: Deutsch<br><small>(Suche: Infinitiv, Past & Participle)</small></button>
+                </div>
+            </div>
+
+            <div id="page-section" style="display:none; margin-top: 20px;">
+                <button class="action-btn secondary" onclick="openPageOverlay()">Buchseiten wählen</button>
+                <div id="selected-pages-display">Alle Seiten</div>
+                <button class="action-btn primary" id="btn-start" onclick="startQuiz()" disabled>Starten</button>
             </div>
-            
-            <button class="action-btn secondary" onclick="openPageOverlay()">Buchseiten wählen</button>
-            <div id="selected-pages-display">Alle Seiten</div>
-            
-            <button class="action-btn primary" onclick="startQuiz()">Start</button>
         </div>
 
         <div id="quiz-screen" style="display:none;">
             <div class="card">
-                <div class="label" id="question-label">Übersetze:</div>
-                <div class="question" id="question-text">...</div>
-                <div id="hint-text" style="font-size: 0.9em; color: #666; margin-bottom: 10px; font-style: italic;"></div>
+                <div class="label" id="q-label">Frage</div>
+                <div class="question" id="q-text">...</div>
+                <div id="q-hint" class="hint"></div>
 
-                <input type="text" id="answer-input" placeholder="Deine Antwort..." autocomplete="off" spellcheck="false">
-
-                <div id="verb-inputs" style="display:none; gap: 10px; margin-bottom: 15px;">
-                    <input type="text" id="input-simple" placeholder="Simple Past" autocomplete="off" spellcheck="false">
-                    <input type="text" id="input-participle" placeholder="Past Participle" autocomplete="off" spellcheck="false">
+                <div id="input-container">
+                    <input type="text" id="inp-standard" placeholder="Antwort..." autocomplete="off">
+                    
+                    <div id="verb-inputs" style="display:none;">
+                        <input type="text" id="inp-inf" placeholder="Infinitiv (Grundform)" autocomplete="off">
+                        <input type="text" id="inp-simple" placeholder="Simple Past" autocomplete="off">
+                        <input type="text" id="inp-part" placeholder="Past Participle" autocomplete="off">
+                    </div>
                 </div>
 
-                <div id="feedback-msg"></div>
+                <div id="feedback" class="feedback"></div>
             </div>
 
-            <button class="action-btn" onclick="checkAnswer()" id="check-btn">Prüfen</button>
-            <button class="action-btn secondary" onclick="nextQuestion()" id="next-btn" style="display:none;">Nächste</button>
+            <button class="action-btn" onclick="checkAnswer()" id="btn-check">Prüfen</button>
+            <button class="action-btn secondary" onclick="nextQuestion()" id="btn-next" style="display:none;">Weiter</button>
             <button class="action-btn danger" onclick="stopQuiz()" style="margin-top: 20px;">Beenden</button>
         </div>
     </div>
@@ -54,12 +75,8 @@
         </div>
     </div>
 
-    <div class="progress-container">
-        <div class="progress-text" id="progress-text">0% Richtig</div>
-        <div class="progress-bar-bg">
-            <div class="progress-bar-fill" id="progress-bar"></div>
-        </div>
-    </div>
+    <div class="progress-bar-bg"><div class="progress-bar-fill" id="progress-bar"></div></div>
+    <div id="stats-text" style="text-align:center; padding:5px; font-size:0.8rem; color:#666;"></div>
 
     <script src="/static/script.js"></script>
 </body>
