Index: lams_learning/web/grouping/wait.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1f7150d6142f994d113ba543736a9f7c0e154337
--- lams_learning/web/grouping/wait.jsp	(.../wait.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_learning/web/grouping/wait.jsp	(.../wait.jsp)	(revision 1f7150d6142f994d113ba543736a9f7c0e154337)
@@ -19,16 +19,13 @@
   http://www.gnu.org/licenses/gpl.txt
 --%>
 
-<%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
-<%@ taglib uri="tags-logic" prefix="logic"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <lams:Page type="learner" title="${GroupingForm.map.title}">
-	<html:form action="/grouping.do" target="_self">
-		<input type="hidden" name="method" value="performGrouping" />
+	<form:form action="grouping/performGrouping.do" modelAttribute="GroupingForm" target="_self">
 		<input type="hidden" name="activityID" value="${GroupingForm.map.activityID}" />
 		<input type="hidden" name="force" value="${GroupingForm.map.previewLesson}" />
 		
@@ -44,10 +41,10 @@
 		</c:if>
 
 		<div class="right-buttons">
-			<html:submit styleClass="btn btn-primary pull-right">
+			<button class="btn btn-primary pull-right">
 				<fmt:message key="label.next.button" />
-			</html:submit>
+			</button>
 		</div>
 
-	</html:form>
+	</form:form>
 </lams:Page>
\ No newline at end of file