Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -ra0bea10c9022cc2146b3067858932029ca721683 -radca50220a7d8b2e43c166ff51dd7e2d22e720e8
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision a0bea10c9022cc2146b3067858932029ca721683)
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision adca50220a7d8b2e43c166ff51dd7e2d22e720e8)
@@ -755,5 +755,7 @@
 label.save.as.course.grouping  =Save as a Course Grouping
 label.enter.course.grouping.name  =Please enter name for the new course grouping
 label.course.groups.name.not.unique  =Course grouping with such name already exists. Please enter another one.
+label.save.as.course.grouping.hint  =You can save the groups as "Course groupings" so it can be used in other lessons as well. If the groups are just specifically for this lesson, you might not want to do this. Otherwise, click the button to give them a name and reuse them later.
+label.advanced.settings  =Advanced settings
 
 #======= End labels: Exported 744 labels for en AU =====
Index: lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java
===================================================================
diff -u -raf507c977983918438951ba8c52c4944a74dfc00 -radca50220a7d8b2e43c166ff51dd7e2d22e720e8
--- lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java	(.../OrganisationGroupAction.java)	(revision af507c977983918438951ba8c52c4944a74dfc00)
+++ lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java	(.../OrganisationGroupAction.java)	(revision adca50220a7d8b2e43c166ff51dd7e2d22e720e8)
@@ -127,12 +127,16 @@
 	    response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a participant in the organisation");
 	    return null;
 	}
-	
+
+	List<OrganisationGrouping> orgGroupings = getUserManagementService().findByProperty(OrganisationGrouping.class,
+		"organisationId", organisationId);
 	Grouping grouping = getLessonGrouping(activityID);
+	
+	// show groups page if this is a lesson mode and user have already chosen a grouping or there is no organisation
+	// groupings available
 	boolean lessonGroupsExist = (grouping != null) && (grouping.getGroups() != null)
 		&& !grouping.getGroups().isEmpty() && !isDefaultChosenGrouping(grouping);
-	if (lessonGroupsExist) {
-	    // this is lesson mode and user have already chosen a grouping before, so show it
+	if (lessonGroupsExist || (activityID!= null &&orgGroupings.isEmpty())) {
 	    return viewGroups(mapping, form, request, response);
 	}
 	
@@ -168,8 +172,6 @@
 	request.setAttribute("canEdit", isGroupSuperuser || (activityID != null));
 
 	Set<OrganisationGroupingDTO> orgGroupingDTOs = new TreeSet<OrganisationGroupingDTO>();
-	List<OrganisationGrouping> orgGroupings = getUserManagementService().findByProperty(OrganisationGrouping.class,
-		"organisationId", organisationId);
 	for (OrganisationGrouping orgGrouping : orgGroupings) {
 	    orgGroupingDTOs.add(new OrganisationGroupingDTO(orgGrouping));
 	}
Index: lams_central/web/css/orgGroup.css
===================================================================
diff -u -ra0bea10c9022cc2146b3067858932029ca721683 -radca50220a7d8b2e43c166ff51dd7e2d22e720e8
--- lams_central/web/css/orgGroup.css	(.../orgGroup.css)	(revision a0bea10c9022cc2146b3067858932029ca721683)
+++ lams_central/web/css/orgGroup.css	(.../orgGroup.css)	(revision adca50220a7d8b2e43c166ff51dd7e2d22e720e8)
@@ -28,7 +28,7 @@
 	border-bottom: thin dotted #2E6E9E;
 }
 table#groupsTable {
-	height: calc(100% - 80px);
+	height: calc(100% - 110px);
 }
 table#groupsTable td {
 	vertical-align: top;
@@ -122,11 +122,18 @@
 	color: white !important;
 }
 
-#save-course-grouping-container {
+#course-grouping-advanced-settings {
     display: inline-block;
     width: 100%;
-    margin-bottom: -7px;
+    padding: 10px;
 }
+#save-course-grouping-button {
+	margin-top: 10px;
+}
+#accordionAdvanced {
+	margin-bottom: 0px;
+	margin-top: 20px;
+}
 .dialogContainer {
     display: none;
     -webkit-overflow-scrolling: touch !important;
Index: lams_central/web/includes/javascript/orgGroup.js
===================================================================
diff -u -raf507c977983918438951ba8c52c4944a74dfc00 -radca50220a7d8b2e43c166ff51dd7e2d22e720e8
--- lams_central/web/includes/javascript/orgGroup.js	(.../orgGroup.js)	(revision af507c977983918438951ba8c52c4944a74dfc00)
+++ lams_central/web/includes/javascript/orgGroup.js	(.../orgGroup.js)	(revision adca50220a7d8b2e43c166ff51dd7e2d22e720e8)
@@ -623,5 +623,10 @@
 		$("#span-tooltip", saveAsCourseGroupingDialog).removeClass("alert-danger").text(LABELS.ENTER_COURSE_GROUPING_NAME_LABEL);
 		$('#dialog-course-grouping-name', saveAsCourseGroupingDialog).removeClass("alert alert-danger");
 	}
+	
+	//scroll to the botom of the page on opening Advanced settings
+	$('#accordionAdvanced').on('shown.bs.collapse', function () {
+		$("html, body").animate({ scrollTop: 170 }, 1000);
+	});
 
 });
\ No newline at end of file
Index: lams_central/web/orgGroup.jsp
===================================================================
diff -u -raf507c977983918438951ba8c52c4944a74dfc00 -radca50220a7d8b2e43c166ff51dd7e2d22e720e8
--- lams_central/web/orgGroup.jsp	(.../orgGroup.jsp)	(revision af507c977983918438951ba8c52c4944a74dfc00)
+++ lams_central/web/orgGroup.jsp	(.../orgGroup.jsp)	(revision adca50220a7d8b2e43c166ff51dd7e2d22e720e8)
@@ -59,15 +59,6 @@
 </lams:head>
 <body>
 
-<c:if test="${lessonMode}">
-	<div id="save-course-grouping-container">
-		<button class="pull-right btn btn-default" onClick="javascript:saveAsCourseGrouping();">
-			<i class="fa fa-save"></i>
-			<fmt:message key="label.save.as.course.grouping" />
-		</button>
-	</div>
-</c:if>
-
 <c:if test="${not lessonMode and (empty usedForBranching or usedForBranching eq false)}">
 
 	<!-- It is shown when user tries to save a grouping with empty name -->
@@ -151,6 +142,21 @@
 	<div class="userContainer"></div>
 </div>
 
+<c:if test="${lessonMode}">
+	<c:set var="adTitle"><fmt:message key="label.advanced.settings" /></c:set>
+	<lams:AdvancedAccordian title="${adTitle}">
+	
+		<div id="course-grouping-advanced-settings">
+			<fmt:message key="label.save.as.course.grouping.hint" />
+			<button id="save-course-grouping-button" class="pull-right btn btn-default" onClick="javascript:saveAsCourseGrouping();">
+				<i class="fa fa-save"></i>
+				<fmt:message key="label.save.as.course.grouping" />
+			</button>
+		</div>
+		
+	</lams:AdvancedAccordian>
+</c:if>
+
 <!-- Inner dialog placeholders -->
 <div id="save-course-grouping-dialog-contents" class="dialogContainer">
 	<span id="span-tooltip">