diff --git a/src/main/webapp/groups.jsp b/src/main/webapp/groups.jsp
index 1d58722..c3af4fa 100644
--- a/src/main/webapp/groups.jsp
+++ b/src/main/webapp/groups.jsp
@@ -17,23 +17,18 @@
 			<tr><th><fmt:message key="groups.column.name"/></th><th><fmt:message key="groups.column.members"/></th><th><fmt:message key="groups.column.operations"/></th></tr>
 			<c:forEach items="${groups}" var="groupentry">
 				<tr>
-					<c:url var="updgroupurl" value="/group/${groupentry.key}?op=edit" />
-					<td><a href="${updgroupurl}">${groupentry.value.name}</a></td>
+					<td>${groupentry.value.name}</td>
 					<td>
-						<table>
-							<c:forEach items="${groupentry.value.members}" var="userdn">
-								<c:url var="userurl" value="/user/${userdn}" />
-								<tr>
-									<td style="padding: 0px 50px 0px 0px">
-										<a href="${userurl}">${users[userdn].login}</a>
-									</td>
-									<td>${users[userdn].lastname}, ${users[userdn].firstname}</td>
-								</tr>
-							</c:forEach>
-						</table>
+						<ul>
+						<c:forEach items="${groupentry.value.members}" var="userdn">
+							<c:url var="userurl" value="/user/${userdn}" />
+							<li><a href="${userurl}">${users[userdn].lastname}, ${users[userdn].firstname} (${users[userdn].login})</a></li>
+						</c:forEach>
+						</ul>
 					</td>
+					<c:url var="updgroupurl" value="/group/${groupentry.key}?op=edit" />
 					<c:url var="delgroupurl" value="/group/${groupentry.key}?op=delete" />
-					<td><a href="${delgroupurl}"><fmt:message key="groups.operations.delete"/></a></td>
+					<td><a href="${updgroupurl}"><fmt:message key="groups.operations.edit"/></a> <a href="${delgroupurl}"><fmt:message key="groups.operations.delete"/></a></td>
 				</tr>
 			</c:forEach>
 		</table>