Index: lams_learning/web/grouping/wait.jsp
===================================================================
diff -u -rd75aa108e0bacdd8466dc0a533856c6f5d089c68 -r88e368163f647f4dec71a7ad2b2e4afe60526af5
--- lams_learning/web/grouping/wait.jsp	(.../wait.jsp)	(revision d75aa108e0bacdd8466dc0a533856c6f5d089c68)
+++ lams_learning/web/grouping/wait.jsp	(.../wait.jsp)	(revision 88e368163f647f4dec71a7ad2b2e4afe60526af5)
@@ -26,19 +26,35 @@
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<c:set var="formAction">/grouping.do?method=performGrouping&activityID=${activity.activityId}</c:set>
-
-	<h1><fmt:message key="label.view.groups.title"/></h1>
-	<p>&nbsp;</p>
-	<p><fmt:message key="label.view.view.groups.wait.message"/></p>
-	
+	<c:set var="formAction">/grouping.do?method=performGrouping&activityID=${activity.activityId}</c:set>
 	<c:if test="${GroupingForm.map.previewLesson == true}">
 		<c:set var="formAction"><c:out value="${formAction}"/>&force=true</c:set>
-		<p><em><fmt:message key="label.grouping.preview.message"/></em></p>
 	</c:if>
 
 	<html:form action="${formAction}" target="_self">
-		<p align="right"><html:submit styleClass="button"><fmt:message key="label.next.button"/></html:submit></p>
-	</html:form>
 
-</div>
\ No newline at end of file
+		<h1 class="no-tabs-below"><c:out value="${GroupingForm.map.title}"/></h1>
+		<div id="header-no-tabs-learner">
+		</div><!--closes header-->
+
+		<div id="content-learner">
+		
+			<p>&nbsp;</p>
+
+			<p><fmt:message key="label.view.view.groups.wait.message"/></p>
+
+			<c:if test="${GroupingForm.map.previewLesson == true}">
+				<c:set var="formAction"><c:out value="${formAction}"/>&force=true</c:set>
+				<p><em><fmt:message key="label.grouping.preview.message"/></em></p>
+			</c:if>
+
+			<table><tr><td><div class="right-buttons">
+					<html:submit styleClass="button"><fmt:message key="label.next.button"/></html:submit>
+			</div></td></tr></table>
+
+		</div>  <!--closes content-->
+
+		<div id="footer-learner">
+		</div><!--closes footer-->
+
+	</html:form>