diff --git a/src/main/java/mops/gruppen2/controller/GroupDetailsController.java b/src/main/java/mops/gruppen2/controller/GroupDetailsController.java
index faa67a2..008851e 100644
--- a/src/main/java/mops/gruppen2/controller/GroupDetailsController.java
+++ b/src/main/java/mops/gruppen2/controller/GroupDetailsController.java
@@ -4,6 +4,7 @@ import mops.gruppen2.domain.Account;
 import mops.gruppen2.domain.Group;
 import mops.gruppen2.domain.Role;
 import mops.gruppen2.domain.User;
+import mops.gruppen2.domain.Visibility;
 import mops.gruppen2.service.ControllerService;
 import mops.gruppen2.service.InviteService;
 import mops.gruppen2.service.KeyCloakService;
@@ -74,6 +75,8 @@ public class GroupDetailsController {
         model.addAttribute("roles", group.getRoles());
         model.addAttribute("user", user);
         model.addAttribute("admin", Role.ADMIN);
+        model.addAttribute("public", Visibility.PUBLIC);
+        model.addAttribute("private", Visibility.PRIVATE);
 
         if (validationService.checkIfAdmin(group, user)) {
             model.addAttribute("link", serverURL + "gruppen2/acceptinvite/" + inviteService.getLinkByGroupId(group.getId()));
@@ -159,6 +162,8 @@ public class GroupDetailsController {
 
         validationService.throwIfNoAdmin(group, principle);
 
+        //TODO: checkIfAdmin checkt nicht, dass die rolle geändert wurde. oder die rolle wird nicht geändert
+
         controllerService.changeRole(account, user, group);
 
         if (!validationService.checkIfAdmin(group, principle)) {
diff --git a/src/main/java/mops/gruppen2/service/ValidationService.java b/src/main/java/mops/gruppen2/service/ValidationService.java
index 9b7131b..b1defef 100644
--- a/src/main/java/mops/gruppen2/service/ValidationService.java
+++ b/src/main/java/mops/gruppen2/service/ValidationService.java
@@ -93,7 +93,7 @@ public class ValidationService {
 
     void throwIfLastAdmin(Account account, Group group) {
         if (checkIfLastAdmin(account, group)) {
-            throw new NoAdminAfterActionException("Du Otto bist letzter Admin!");
+            throw new NoAdminAfterActionException("Du bist letzter Admin!");
         }
     }
 
diff --git a/src/main/resources/templates/detailsMember.html b/src/main/resources/templates/detailsMember.html
index efdf0bf..4fea4cc 100644
--- a/src/main/resources/templates/detailsMember.html
+++ b/src/main/resources/templates/detailsMember.html
@@ -124,7 +124,8 @@
                     <ul class="list-group-flush" style="background: slategrey"
                         th:each="member : ${group.getMembers()}">
                         <li class="list-group-item" style="background: aliceblue">
-                            <span th:text="${member.getId()}"></span>
+                            <span th:if='${group.getVisibility() == public}' th:text="${member.getId()}"></span>
+                            <span th:if='${group.getVisibility() == private}' th:text="${#strings.abbreviate(member.getGivenname(), 15)  + ' ' + member.getFamilyname().substring(0, 1) + '.'}"></span>
                             <span class="badge badge-success"
                                   th:if='${group.getRoles().get(member.getId()) == admin}'>admin</span>
                         </li>
diff --git a/src/main/resources/templates/editMembers.html b/src/main/resources/templates/editMembers.html
index 7f39260..afc7c77 100644
--- a/src/main/resources/templates/editMembers.html
+++ b/src/main/resources/templates/editMembers.html
@@ -100,7 +100,7 @@
                         </thead>
                         <tbody class="table-striped">
                         <tr th:each="member : ${group.getMembers()}">
-                            <th th:text="${member.getId()}"></th>
+                            <th th:text="${#strings.abbreviate(member.getGivenname(), 15)  + ' ' + member.getFamilyname().substring(0, 1) + '.'}"></th>
                             <td>
                                 <span th:if='${group.getRoles().get(member.getId()) != admin}'>Mitglied</span>
                                 <span th:if='${group.getRoles().get(member.getId()) == admin}'>Admin</span>
@@ -114,8 +114,7 @@
                                         <input th:name="user_id" th:value="${member.getId()}"
                                                type="hidden">
                                         <button class="btn btn-warning btn-sm" type="submit"
-                                                style="margin: 5px">Rolle
-                                                                    ändern
+                                                style="margin: 5px;">Rolle ändern
                                         </button>
                                     </form>
                                     <form method="post"