diff --git a/src/main/resources/templates/create.html b/src/main/resources/templates/create.html
index 31a66da..5f28fb5 100644
--- a/src/main/resources/templates/create.html
+++ b/src/main/resources/templates/create.html
@@ -40,7 +40,7 @@
                     </textarea>
                 </div>
                 <div class="form-group">
-                    <input type="submit">
+                    <button type="submit">Erstellen</button>
                 </div>
             </div>
         </form>
diff --git a/src/main/resources/templates/search.html b/src/main/resources/templates/search.html
index a19251f..c722a7d 100644
--- a/src/main/resources/templates/search.html
+++ b/src/main/resources/templates/search.html
@@ -25,7 +25,57 @@
     </nav>
 </header>
 <main th:fragment="bodycontent">
-
+    <div class="container-fluid">
+        <div class="row">
+            <h1>Gruppensuche</h1>
+                <div class="container-fluid">
+                    <form action="/findGroup" method="get">
+                        <div style="border: 10px solid aliceblue; background: aliceblue">
+                            <div class="form-group">
+                                <label>Suchbegriff:</label>
+                                <input class="form-control" type="text" value="" name="suchbegriff" placeholder="z.B. Programmieren, Lerngruppe, ...">
+                            </div>
+                            <div>
+                                <input type="checkbox" style="margin-left: 10px;"> Öffentliche Gruppen
+                                <input type="checkbox" style="margin-left: 24px;"> Private Gruppen
+                                <br>
+                                <input type="checkbox" style="margin-left: 10px;"> Suchbegriff im Namen
+                                <input type="checkbox" style="margin-left: 10px;"> Suchbegriff in der Beschreibung
+                                <input type="checkbox" style="margin-left: 10px;"> Suchbegriff in der Veranstaltung
+                            </div>
+                            <br>
+                            <button type="button" class="btn btn-primary" style="background: dodgerblue">Suchen</button>
+                        </div>
+                    </form>
+                    <br>
+                    <table class="table">
+                        <!-- Erscheint dann, wenn man "Suchen" Button klickt und Ergebnisse angezeigt werden, aber so solls aussehen -->
+                        <thead>
+                        <tr>
+                            <th scope="col">Gruppenname</th>
+                            <th scope="col">Beschreibung</th>
+                            <th scope="col">Öffentlich/Privat</th>
+                            <th scope="col">Mitgliederanzahl</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr>
+                            <th scope="row">LA1 Kursgruppe</th>
+                            <td>Gruppe für den Kurs LA1</td>
+                            <td>Öffentlich</td>
+                            <td>318</td>
+                        </tr>
+                        <tr>
+                            <th scope="row">Lerngruppe LA1</th>
+                            <td>Lerngruppe zur Bearbeitung von Übungszetteln</td>
+                            <td>Privat</td>
+                            <td>6</td>
+                        </tr>
+                        </tbody>
+                    </table>
+                </div>
+        </div>
+    </div>
 </main>
 </body>
 </html>
\ No newline at end of file