diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
index 36cd403..6999a81 100644
--- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
+++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
@@ -111,4 +111,16 @@ public class Gruppen2Controller {
         throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Group not found");
     }
 
+    @RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator)"})
+    @GetMapping("/detailsSearch")
+    public String showGroupDetailsNoMember (KeycloakAuthenticationToken token, Model model, @RequestParam (value="id") Long id) throws EventException {
+        model.addAttribute("account", keyCloakService.createAccountFromPrincipal(token));
+        Group group = userService.getGroupById(id);
+        if (group!=null) {
+            model.addAttribute("group", group);
+            return "detailsNoMember";
+        }
+        throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Group not found");
+    }
+
 }
diff --git a/src/main/resources/templates/create.html b/src/main/resources/templates/create.html
index 08c2b7e..f9084b8 100644
--- a/src/main/resources/templates/create.html
+++ b/src/main/resources/templates/create.html
@@ -26,37 +26,41 @@
     </nav>
 </header>
 <main th:fragment="bodycontent">
-    <h1>Gruppenerstellung</h1>
     <div class="container-fluid">
-        <form method="post" action="/gruppen2/createGroup">
-            <div class="shadow p-2" style=" border: 10px solid aliceblue; background: aliceblue">
-                <div class="form-group">
-                    <label for="titel">Titel</label>
-                    <input type="text" class="form-control" id="titel" th:name="title" required>
-                </div>
-                <div class="form-group">
-                    <label for="beschreibung">Beschreibung</label>
-                    <textarea th:name="beschreibung" class="form-control" id="beschreibung" rows="3" required></textarea>
-                </div>
-                <div class="custom-control custom-checkbox">
-                    <input type="checkbox" id="visibility" class="custom-control-input" th:name="visibility">
-                    <label class="custom-control-label" for="visibility">Private Gruppe</label>
-                </div>
-                <div class="form-group">
-                    <label for="sel1"></label>
-                    <select class="form-control" id="sel1">
-                        <option selected="true" disabled>--Bitte Veranstaltung auswählen--</option>
-                        <option>1</option>
-                        <option>2</option>
-                        <option>3</option>
-                        <option>4</option>
-                    </select>
-                </div>
-                <div class="form-group pt-4">
-                    <button class="btn btn-primary" type="submit" style="background: #52a1eb; border-style: none">Erstellen</button>
-                </div>
+        <div class="row">
+            <div class="col-10">
+                <h1>Gruppenerstellung</h1>
+                <form method="post" action="/gruppen2/createGroup">
+                    <div class="shadow p-2" style=" border: 10px solid aliceblue; background: aliceblue">
+                        <div class="form-group">
+                            <label for="titel">Titel</label>
+                            <input type="text" class="form-control" id="titel" th:name="title" required>
+                        </div>
+                        <div class="form-group">
+                            <label for="beschreibung">Beschreibung</label>
+                            <textarea th:name="beschreibung" class="form-control" id="beschreibung" rows="3" required></textarea>
+                        </div>
+                        <div class="custom-control custom-checkbox">
+                            <input type="checkbox" id="visibility" class="custom-control-input" th:name="visibility">
+                            <label class="custom-control-label" for="visibility">Private Gruppe</label>
+                        </div>
+                        <div class="form-group">
+                            <label for="sel1"></label>
+                            <select class="form-control" id="sel1">
+                                <option selected="true" disabled>--Bitte Veranstaltung auswählen--</option>
+                                <option>1</option>
+                                <option>2</option>
+                                <option>3</option>
+                                <option>4</option>
+                            </select>
+                        </div>
+                        <div class="form-group pt-4">
+                            <button class="btn btn-primary" type="submit" style="background: #52a1eb; border-style: none">Erstellen</button>
+                        </div>
+                    </div>
+                </form>
             </div>
-        </form>
+        </div>
     </div>
 </main>
 </body>
diff --git a/src/main/resources/templates/detailsNoMember.html b/src/main/resources/templates/detailsNoMember.html
index f351207..e12d035 100644
--- a/src/main/resources/templates/detailsNoMember.html
+++ b/src/main/resources/templates/detailsNoMember.html
@@ -25,7 +25,26 @@
     </nav>
 </header>
 <main th:fragment="bodycontent">
-
+    <div class="container-fluid">
+        <div class="row">
+            <div class="col-9" style="border: 10px solid aliceblue; background: aliceblue">
+                <form action="/" method="get">
+                    <h1 style="color: dodgerblue; font-weight: bold" th:text="${group.getTitle()}"></h1>
+                    <p style="font-weight: bold">
+                        <span class="badge badge-pill badge-dark" style="background: darkslategray" th:if="${group.getVisibility() == group.getVisibility().PRIVATE }">Private Gruppe</span>
+                        <span class="badge badge-pill badge-primary" th:if="${group.getVisibility() == group.getVisibility().PUBLIC}">Öffentliche Gruppe</span>
+                        <span class="badge badge-pill badge-success" style="background: lightseagreen" th:if="${group.getType() == group.getType().LECTURE}"> Veranstaltung</span>
+                    </p>
+                    <p th:text="${group.getDescription()}"></p>
+                    <div class="form-group">
+                        <div class="text-right">
+                            <button class="btn btn-primary" style="border-style: none;">Gruppe beitreten</button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
 </main>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/errorRenameLater.html b/src/main/resources/templates/errorRenameLater.html
new file mode 100644
index 0000000..01fbadc
--- /dev/null
+++ b/src/main/resources/templates/errorRenameLater.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+    <meta charset="UTF-8">
+    <title>Error</title>
+</head>
+<body>
+<div class="mx-auto" style="vertical-align: center; horiz-align: center; top: 50%; left: 50%; margin-top: 200px">
+    <div class="text-center" style="background: aliceblue; align-items: center; margin: auto; width: 1000px; vertical-align: center; padding: 50px; display: block">
+        <h1 style="text-align: center">Da ist etwas schiefgelaufen!</h1>
+        <h2 style="text-align: center">Die Seite, nach der du suchst, scheint nicht zu existieren.</h2>
+        <br>
+        <div>
+            <button type="button" class="btn btn-primary" style="margin: auto">
+                <a style="color: white" href="#" onclick="javascript:window.history.back(-1);return false;">Zurück zur letzten Seite</a>
+            </button>
+        </div>
+        <br>
+    </div>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index f41f418..db3ee9d 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -26,12 +26,12 @@
 </header>
 <main th:fragment="bodycontent">
     <div class="container-fluid">
-        <div class="row" >
+        <div class="row">
             <div class="col-10">
                 <h1>Meine Gruppen</h1>
                 <form action="/" method="get">
                     <div th:each="gruppe: ${gruppen}">
-                        <div style="border: 10px solid aliceblue; background: aliceblue">
+                        <div class="shadow" style="border: 10px solid aliceblue; background: aliceblue">
                             <h3>
                                 <a th:href="@{/gruppen2/details(id=${gruppe.getId()})}" style="color: dodgerblue; font-weight: bold" th:text="${gruppe.getTitle()}"></a>
                             </h3>
@@ -41,7 +41,7 @@
                     </div>
                 </form>
             </div>
-            <div class="col-2" >
+            <div class="col-2">
                 <div class="card" style="background: lightgrey">
                     <div class="card-body">
                         <h2 class="card-title" th:text="${user.getUser_id()}" style="text-align: center">user_id</h2>
diff --git a/src/main/resources/templates/search.html b/src/main/resources/templates/search.html
index 0a6e616..4eab94f 100644
--- a/src/main/resources/templates/search.html
+++ b/src/main/resources/templates/search.html
@@ -27,38 +27,39 @@
 <main th:fragment="bodycontent">
     <div class="container-fluid">
         <div class="row">
-            <h1>Gruppensuche</h1>
-                <div class="container-fluid">
-                    <form action="/gruppen2/findGroup" method="get">
-                        <div style="border: 10px solid aliceblue; background: aliceblue">
-                            <div class="form-group">
-                                <label for="suchleiste">Suchbegriff:</label>
-                                <input id="suchleiste" class="form-control" placeholder="z.B. Programmieren, Lerngruppe, ..." th:name="suchbegriff" type="text">
-                            </div>
-                            <button type="submit" class="btn btn-primary" style="background: #52a1eb; border-style: none">Suchen</button>
+            <div class="col-10">
+                <h1>Gruppensuche</h1>
+                <form action="/gruppen2/findGroup" method="get">
+                    <div class="shadow" style="border: 10px solid aliceblue; background: aliceblue">
+                        <div class="form-group">
+                            <label for="suchleiste">Suchbegriff:</label>
+                            <input id="suchleiste" class="form-control" placeholder="z.B. Programmieren, Lerngruppe, ..." th:name="suchbegriff" type="text">
                         </div>
                     </form>
                     <br>
                     <table class="table">
                         <!-- Erscheint dann, wenn man "Suchen" Button klickt und Ergebnisse angezeigt werden, aber so solls aussehen -->
                         <thead th:if="${!gruppen.isEmpty()}">
-                        <tr>
-                            <th scope="col">Gruppenname</th>
-                            <th scope="col">Beschreibung</th>
-                            <th scope="col">Öffentlich/Privat</th>
-                            <th scope="col">Mitgliederanzahl</th>
-                        </tr>
+                            <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 th:each="gruppe : ${gruppen}">
-                        <tr>
-                            <th scope="row" th:text="${gruppe.title}">Gruppenname</th>
-                            <td th:text="${gruppe.getDescription()}">Beschreibung</td>
-                            <td th:text="${gruppe.getVisibility()}">Öffentlich</td>
-                            <td th:text="${gruppe.getMembers().size()}">Mitgliederanzahl</td>
-                        </tr>
+                            <tr>
+                                <th scope="row">
+                                    <a th:href="@{/gruppen2/detailsSearch(id=${gruppe.getId()})}"  th:text="${gruppe.title}">Gruppenname</a>
+                                </th>
+                                <td th:text="${gruppe.getDescription()}">Beschreibung</td>
+                                <td th:text="${gruppe.getVisibility()}">Öffentlich</td>
+                                <td th:text="${gruppe.getMembers().size()}">Mitgliederanzahl</td>
+                            </tr>
                         </tbody>
                     </table>
                 </div>
+
         </div>
     </div>
 </main>