Index: dbLearnStar-webApp/pom.xml
===================================================================
--- dbLearnStar-webApp/pom.xml	(revision 69b7fcf1e161311554e1886a83f32db11351f37b)
+++ dbLearnStar-webApp/pom.xml	(revision 524d6c2aa565c3a52fff2417530e3e878803703d)
@@ -11,5 +11,5 @@
 	<groupId>dblearnstar</groupId>
 	<artifactId>dblearnstar</artifactId>
-	<version>0.8.10</version>
+	<version>0.8.11</version>
 	<name>dbLearnStar</name>
 
Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/GroupManagement.java
===================================================================
--- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/GroupManagement.java	(revision 69b7fcf1e161311554e1886a83f32db11351f37b)
+++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/GroupManagement.java	(revision 524d6c2aa565c3a52fff2417530e3e878803703d)
@@ -38,4 +38,5 @@
 import dblearnstar.model.entities.GroupMember;
 import dblearnstar.model.entities.Person;
+import dblearnstar.model.entities.Student;
 import dblearnstar.webapp.annotations.AdministratorPage;
 import dblearnstar.webapp.model.StudentSelectModel;
@@ -62,20 +63,23 @@
 	private SelectModelFactory selectModelFactory;
 
+	@Persist
+	@Property
+	private String errors;
+	@Property
+	@Persist
+	private Group selectedGroup;
+	@Property
+	@Persist
+	private Group editGroup;
+	@Property
+	@Persist
+	private GroupMember editGroupMember;
+	@Property
+	@Persist
+	private GroupFocusOnTest editGroupFocusOnTest;
+
 	@Property
 	private Group group;
 	@Property
-	@Persist
-	private Group selectedGroup;
-
-	@Property
-	@Persist
-	private Group editGroup;
-	@Property
-	@Persist
-	private GroupMember editGroupMember;
-	@Property
-	@Persist
-	private GroupFocusOnTest editGroupFocusOnTest;
-	@Property
 	private GroupMember groupMember;
 	@Property
@@ -83,4 +87,6 @@
 	@Property
 	private Person personToAdd;
+	@Property
+	private String studentsToImport;
 
 	public void onActivate() {
@@ -113,10 +119,34 @@
 	public void onSuccessFromNewGroupForm() {
 		logger.info("Submitting new group");
+		errors = "";
+		genericService.saveOrUpdate(editGroup);
 		if (editGroupMember != null) {
 			genericService.saveOrUpdate(editGroupMember);
 		}
-		genericService.saveOrUpdate(editGroup);
-		editGroupMember = null;
-		editGroup = null;
+		if (studentsToImport != null) {
+			for (String line : studentsToImport.split("\\r?\\n")) {
+				logger.info(">>> Importing {} <<<", line);
+				for (String lineField : line.split("[,\t]")) {
+					try {
+						Student s = personManager
+								.getStudentsByPersonId(personManager.getPersonByUsername(lineField).getPersonId())
+								.get(0);
+						GroupMember gm = new GroupMember();
+						gm.setGroup(editGroup);
+						gm.setStudent(s);
+						genericService.save(gm);
+					} catch (Exception e) {
+						errors += ">>> Student " + line + " can not be imported due to: " + e.getLocalizedMessage();
+					}
+				}
+			}
+			if (!(errors.length() > 0)) {
+				errors = "";
+				studentsToImport = null;
+				editGroupMember = null;
+			}
+		} else {
+			editGroup = null;
+		}
 	}
 
@@ -198,3 +228,15 @@
 		}
 	}
+
+	void onCancelEditGroup() {
+		editGroup = null;
+	}
+
+	void onCancelNewMemberForm() {
+		editGroupMember = null;
+	}
+
+	void onCancelNewFocusOnTestForm() {
+		editGroupFocusOnTest = null;
+	}
 }
Index: dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/GroupManagement.tml
===================================================================
--- dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/GroupManagement.tml	(revision 69b7fcf1e161311554e1886a83f32db11351f37b)
+++ dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/GroupManagement.tml	(revision 524d6c2aa565c3a52fff2417530e3e878803703d)
@@ -6,15 +6,19 @@
 	<p:then>
 		<h3>Group Info</h3>
-		
+
 		<div class="col-sm-12">
-			<form t:id="NewGroupForm" t:type="BeanEditForm" t:object="editGroup"
-				class="form-horizontal" t:exclude="groupId" t:cancel="true">
+			<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>Group members</h3>
-		
+
 		<div class="col-sm-12">
-			<ol style="columns: 3;">
+			<ol>
 				<li t:type="loop" t:id="groupMembers"
 					t:source="editGroup.groupMembers" t:value="groupMember">
@@ -31,17 +35,22 @@
 			</ol>
 			<div t:type="if" t:test="editGroupMember">
-				<form t:id="NewMemberForm" t:type="beaneditform"
-					t:object="editGroupMember" t:model="modelGroupMember"
-					t:cancel="true">
-					<p:student>
-						<select t:type="select" t:model="AllStudentsModel"
-							t:value="editGroupMember.student"></select>
-					</p:student>
-				</form>
+				<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>
-		
+
 		<h3>Group Focus On Tests</h3>
-		
+
 		<div class="col-sm-12">
 			<ol>
@@ -58,12 +67,17 @@
 			</ol>
 			<div t:type="if" t:test="editGroupFocusOnTest">
-				<form t:id="NewFocusOnTestForm" t:type="beaneditform"
-					t:object="editGroupFocusOnTest" t:model="modelGroupFocusOnTest"
-					t:cancel="true">
-					<p:testInstance>
-						<select t:type="select" t:model="AllTestInstancesModel"
-							t:value="editGroupFocusOnTest.testInstance"></select>
-					</p:testInstance>
-				</form>
+				<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>