diff --git a/src/main/webapp/group.jsp b/src/main/webapp/group.jsp
index 5e898c7..6de5118 100644
--- a/src/main/webapp/group.jsp
+++ b/src/main/webapp/group.jsp
@@ -48,44 +48,14 @@
 					<div class="form-group">
 						<label for="membership" class="col-sm-3 control-label"><fmt:message key="groups.label.members"/></label> 
 						<div class="col-sm-9" id ="membership">
-							<jsp:useBean id="checker" class="de.jalin.ldapadmin.beans.MembershipCheck" />
-							<table>
-								<c:forEach items="${users}" var="userentry" >
+							<c:forEach items="${users}" var="userentry" >
+								<div class="checkbox">
+									<jsp:useBean id="checker" class="de.jalin.ldapadmin.beans.MembershipCheck" />
 									<jsp:setProperty property="user" name="checker" value="${userentry.value}" />
 									<jsp:setProperty property="group" name="checker" value="${group}" />
-									<c:url var="userurl" value="/user/${userentry.key}" />
-									<c:if test="${ not empty checker.checked }">
-										<tr>
-											<td style="padding: 0px 30px 0px 0px">
-												<input type="checkbox" id="${userentry.value.login}" name="check_user_${userentry.value.login}" ${checker.checked}>
-												<a href="${userurl}">${userentry.value.login}</a>
-											</td>
-											<td style="padding: 0px 10px 0px 0px">${userentry.value.firstname}</td>
-											<td>${userentry.value.lastname}</td>
-										</tr>
-									</c:if>
-								</c:forEach>
-							</table>
-							<div class="checkbox">
-								------------------------------------------------------------------------------------------------------------------------------------------
-							</div>
-							<table>
-								<c:forEach items="${users}" var="userentry" >
-									<jsp:setProperty property="user" name="checker" value="${userentry.value}" />
-									<jsp:setProperty property="group" name="checker" value="${group}" />
-									<c:url var="userurl" value="/user/${userentry.key}" />
-									<c:if test="${ empty checker.checked }">
-										<tr>
-											<td style="padding: 0px 30px 0px 0px">
-												<input type="checkbox" id="${userentry.value.login}" name="check_user_${userentry.value.login}" ${checker.checked}>
-												<a href="${userurl}">${userentry.value.login}</a>
-											</td>
-											<td style="padding: 0px 10px 0px 0px">${userentry.value.firstname}</td>
-											<td>${userentry.value.lastname}</td>
-										</tr>
-									</c:if>
-								</c:forEach>
-							</table>
+									<label><input type="checkbox" id="${userentry.value.login}" name="check_user_${userentry.value.login}" ${checker.checked}>${userentry.value.firstname} ${userentry.value.lastname} (${userentry.value.login})</label>
+								</div>
+							</c:forEach>
 						</div>
 					</div>
 					<c:if test="${ formdisabled ne 'disabled' }">