Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
===================================================================
diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -reab60a3945e015e910487c6be9e7236a13e1a2e2
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java	(.../GroupingAction.java)	(revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java	(.../GroupingAction.java)	(revision eab60a3945e015e910487c6be9e7236a13e1a2e2)
@@ -147,6 +147,7 @@
 	groupForm.set("previewLesson", learnerProgress.getLesson().isPreviewLesson());
 	groupForm.set("title", activity.getTitle());
 
+	request.setAttribute(AttributeNames.PARAM_LESSON_ID, lessonId);
 	if (groupingDone) {
 	    request.setAttribute(GroupingAction.FINISHED_BUTTON, Boolean.TRUE);
 	    return mapping.findForward(GroupingAction.VIEW_GROUP);
Index: lams_learning/web/layout/groupWaitLayout.jsp
===================================================================
diff -u -r227fa736cd530da4efce84f1dd65c68d3e26f2dc -reab60a3945e015e910487c6be9e7236a13e1a2e2
--- lams_learning/web/layout/groupWaitLayout.jsp	(.../groupWaitLayout.jsp)	(revision 227fa736cd530da4efce84f1dd65c68d3e26f2dc)
+++ lams_learning/web/layout/groupWaitLayout.jsp	(.../groupWaitLayout.jsp)	(revision eab60a3945e015e910487c6be9e7236a13e1a2e2)
@@ -27,6 +27,7 @@
 	<lams:head>
 		<title><fmt:message key="${label.view.groups.title}"/></title>
 		<lams:css/>
+		<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
 		<META HTTP-EQUIV="Refresh" CONTENT="300;URL=<lams:WebAppURL/>/grouping.do?method=performGrouping&activityID=${activity.activityId}">
 	  </lams:head>
 
Index: lams_learning/web/layout/layout.jsp
===================================================================
diff -u -r227fa736cd530da4efce84f1dd65c68d3e26f2dc -reab60a3945e015e910487c6be9e7236a13e1a2e2
--- lams_learning/web/layout/layout.jsp	(.../layout.jsp)	(revision 227fa736cd530da4efce84f1dd65c68d3e26f2dc)
+++ lams_learning/web/layout/layout.jsp	(.../layout.jsp)	(revision eab60a3945e015e910487c6be9e7236a13e1a2e2)
@@ -42,7 +42,8 @@
 	<c:set var="lams">
 		<lams:LAMSURL />
 	</c:set>
-		
+
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 	<script type="text/javascript"
 		src="${lams}includes/javascript/common.js"></script>
 </lams:head>