Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/GroupManagement.java
===================================================================
--- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/GroupManagement.java	(revision 524d6c2aa565c3a52fff2417530e3e878803703d)
+++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/GroupManagement.java	(revision 7a99866c20d49cf53b57ac0975650e5253e2a715)
@@ -26,9 +26,12 @@
 import org.apache.tapestry5.annotations.Persist;
 import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.beaneditor.RelativePosition;
 import org.apache.tapestry5.beanmodel.BeanModel;
 import org.apache.tapestry5.beanmodel.services.BeanModelSource;
+import org.apache.tapestry5.beanmodel.services.PropertyConduitSource;
 import org.apache.tapestry5.commons.Messages;
 import org.apache.tapestry5.hibernate.annotations.CommitAfter;
 import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.ComponentSource;
 import org.apache.tapestry5.services.SelectModelFactory;
 import org.slf4j.Logger;
@@ -39,4 +42,6 @@
 import dblearnstar.model.entities.Person;
 import dblearnstar.model.entities.Student;
+import dblearnstar.model.entities.StudentSubmitSolution;
+import dblearnstar.model.model.ModelConstants;
 import dblearnstar.webapp.annotations.AdministratorPage;
 import dblearnstar.webapp.model.StudentSelectModel;
@@ -62,4 +67,11 @@
 	@Inject
 	private SelectModelFactory selectModelFactory;
+
+	@Inject
+	private BeanModelSource beanModelSource;
+	@Inject
+	private Messages messages;
+	@Inject
+	private PropertyConduitSource pcs;
 
 	@Persist
@@ -184,10 +196,4 @@
 	}
 
-	@Inject
-	private BeanModelSource beanModelSource;
-
-	@Inject
-	private Messages messages;
-
 	@Property
 	@Persist
@@ -207,4 +213,14 @@
 	}
 
+	public BeanModel<GroupMember> getGroupMemberGridModel() {
+		BeanModel<GroupMember> model = beanModelSource.createDisplayModel(GroupMember.class, messages);
+		model.exclude("groupMemberId");
+		model.add("userName", pcs.create(GroupMember.class, "student.person.userName"));
+		model.add("firstName", pcs.create(GroupMember.class, "student.person.firstName"));
+		model.add("lastName", pcs.create(GroupMember.class, "student.person.lastName"));
+		model.addEmpty("actions");
+		return model;
+	}
+
 	public SelectModel getAllTestInstancesModel() {
 		return selectModelFactory.create(testManager.getAllTestInstances(), "title");
Index: dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/GroupManagement.tml
===================================================================
--- dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/GroupManagement.tml	(revision 524d6c2aa565c3a52fff2417530e3e878803703d)
+++ dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/GroupManagement.tml	(revision 7a99866c20d49cf53b57ac0975650e5253e2a715)
@@ -6,78 +6,87 @@
 	<p:then>
 		<h3>Group Info</h3>
+		<div class="row">
+			<div class="col-6">
+				<form t:id="NewGroupForm" t:type="form" class="form-horizontal">
+					<t:beaneditor t:object="editGroup" t:exclude="groupId"></t:beaneditor>
+					<div class="form-group">
+						<t:label t:for="userNamesToImport" />
+						<t:textarea t:rows="10" t:id="userNamesToImport" t:value="studentsToImport" />
+					</div>
+					<p class="incorrect">${errors}</p>
+					<t:submit t:value="OK" />
+					<a href="" t:type="eventlink" t:id="cancelEditGroup">Cancel</a>
+				</form>
 
-		<div class="col-sm-12">
-			<form t:id="NewGroupForm" t:type="form" class="form-horizontal">
-				<t:beaneditor t:object="editGroup" t:exclude="groupId"></t:beaneditor>
-				<t:textarea t:value="studentsToImport" />
-				<p class="incorrect">${errors}</p>
-				<t:submit t:value="OK" />
-				<a href="" t:type="eventlink" t:id="cancelEditGroup">Cancel</a>
-			</form>
-		</div>
+				<h3 class="mt-3">Group Focus On Tests</h3>
 
-		<h3>Group members</h3>
+				<div class="col-sm-12">
+					<ol>
+						<li t:type="loop" t:id="groupFocusOnTests"
+							t:source="editGroup.groupFocusOnTests" t:value="groupFocusOnTest">
+							${groupFocusOnTest.testInstance.title}<a href=""
+							t:type="actionlink" t:id="DeleteGroupFocusOnTest"
+							t:context="groupFocusOnTest" class="btn btn-sm btn-default"><t:SVGIcon
+									t:path="minus-square" /></a>
+						</li>
+						<li><a href="" t:type="actionlink" t:id="newFocusOnTest"
+							t:context="editGroup" class="btn btn-sm btn-info" role="button"><span
+								class="plus-square"></span> New Focus On Test</a></li>
+					</ol>
+					
+					<div t:type="if" t:test="editGroupFocusOnTest">
+						<div t:type="modalbox">
+							<form t:id="NewFocusOnTestForm" t:type="form">
+								<t:beaneditor t:object="editGroupFocusOnTest"
+									t:model="modelGroupFocusOnTest" t:add="testInstance">
+									<p:testInstance>
+										<select t:type="select" t:model="AllTestInstancesModel"
+											t:value="editGroupFocusOnTest.testInstance"></select>
+									</p:testInstance>
+								</t:beaneditor>
+								<t:submit t:value="OK" />
+								<a href="" t:type="eventlink" t:id="cancelNewFocusOnTestForm">Cancel</a>
+							</form>
+						</div>
+					</div>
+				</div>
 
-		<div class="col-sm-12">
-			<ol>
-				<li t:type="loop" t:id="groupMembers"
-					t:source="editGroup.groupMembers" t:value="groupMember">
-					${groupMember.student.person.lastName}
-					${groupMember.student.person.firstName}
-					[${groupMember.student.person.userName}]<a href=""
-					t:type="actionlink" t:id="DeleteGroupMember"
-					t:context="groupMember" class="btn btn-sm btn-default"><t:SVGIcon
-							t:path="user-minus" /></a>
-				</li>
-				<li><a href="" t:type="actionlink" t:id="newMember"
-					t:context="editGroup" class="btn btn-sm btn-info" role="button"><t:SVGIcon
-							t:path="user-plus" /> New member</a></li>
-			</ol>
-			<div t:type="if" t:test="editGroupMember">
-				<div t:type="modalbox">
-					<form t:id="NewMemberForm" t:type="form">
-						<t:beaneditor t:object="editGroupMember"
-							t:model="modelGroupMember" t:add="student">
-							<p:student>
-								<select t:type="select" t:model="AllStudentsModel"
-									t:value="editGroupMember.student"></select>
-							</p:student>
-						</t:beaneditor>
-						<t:submit t:value="OK" />
-						<a href="" t:type="eventlink" t:id="cancelNewMemberForm">Cancel</a>
-					</form>
+
+			</div>
+
+			<div class="col-6">
+				<h3>Group members</h3>
+
+				<div class="col-sm-12">
+					<table class="table table-sm table-hover table-bordered table-striped" t:type="grid" t:id="groupMembers"
+						t:model="groupMemberGridModel" t:source="editGroup.groupMembers"
+						t:row="groupMember" t:rowsperpage="50">
+						<p:actionsCell>
+							<a href="" t:type="actionlink" t:id="DeleteGroupMember"
+								t:context="groupMember" class="btn btn-sm btn-default"><t:SVGIcon
+									t:path="user-minus" /></a>
+						</p:actionsCell>
+					</table>
+
+					<a href="" t:type="actionlink" t:id="newMember"
+						t:context="editGroup" class="btn btn-sm btn-info" role="button"><t:SVGIcon
+							t:path="user-plus" /> New member</a>
+					<div t:type="if" t:test="editGroupMember">
+						<div t:type="modalbox">
+							<form t:id="NewMemberForm" t:type="form">
+								<t:beaneditor t:object="editGroupMember"
+									t:model="modelGroupMember" t:add="student">
+									<p:student>
+										<select t:type="select" t:model="AllStudentsModel"
+											t:value="editGroupMember.student"></select>
+									</p:student>
+								</t:beaneditor>
+								<t:submit t:value="OK" />
+								<a href="" t:type="eventlink" t:id="cancelNewMemberForm">Cancel</a>
+							</form>
+						</div>
+					</div>
 				</div>
-			</div>
-		</div>
 
-		<h3>Group Focus On Tests</h3>
-
-		<div class="col-sm-12">
-			<ol>
-				<li t:type="loop" t:id="groupFocusOnTests"
-					t:source="editGroup.groupFocusOnTests" t:value="groupFocusOnTest">
-					${groupFocusOnTest.testInstance.title}<a href=""
-					t:type="actionlink" t:id="DeleteGroupFocusOnTest"
-					t:context="groupFocusOnTest" class="btn btn-sm btn-default"><t:SVGIcon
-							t:path="minus-square" /></a>
-				</li>
-				<li><a href="" t:type="actionlink" t:id="newFocusOnTest"
-					t:context="editGroup" class="btn btn-sm btn-info" role="button"><span
-						class="plus-square"></span> New Focus On Test</a></li>
-			</ol>
-			<div t:type="if" t:test="editGroupFocusOnTest">
-				<div t:type="modalbox">
-					<form t:id="NewFocusOnTestForm" t:type="form">
-						<t:beaneditor t:object="editGroupFocusOnTest"
-							t:model="modelGroupFocusOnTest" t:add="testInstance">
-							<p:testInstance>
-								<select t:type="select" t:model="AllTestInstancesModel"
-									t:value="editGroupFocusOnTest.testInstance"></select>
-							</p:testInstance>
-						</t:beaneditor>
-						<t:submit t:value="OK" />
-						<a href="" t:type="eventlink" t:id="cancelNewFocusOnTestForm">Cancel</a>
-					</form>
-				</div>
 			</div>
 		</div>