Index: lams_central/web/groupContents.jsp
===================================================================
diff -u -r4c2d1f37b92435907ec4ce23cb635a7cd9e4161e -r0d3d616005d7854944b57c0b56613454068f28bc
--- lams_central/web/groupContents.jsp	(.../groupContents.jsp)	(revision 4c2d1f37b92435907ec4ce23cb635a7cd9e4161e)
+++ lams_central/web/groupContents.jsp	(.../groupContents.jsp)	(revision 0d3d616005d7854944b57c0b56613454068f28bc)
@@ -1,6 +1,6 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:forEach var="lesson" items="${org.lessons}">
+<c:forEach var="lesson" items="${pageScope.org.lessons}">
 	<div id="${lesson.id}" class="j-single-lesson">
 		<c:choose>
 			<c:when test="${empty lesson.url}">
@@ -29,7 +29,7 @@
 			<c:forEach var="lessonlink" items="${lesson.links}">
 				<c:choose><c:when test="${addTourClass}"><c:set var="tourClass">class="tour-${lessonlink.id}"</c:set></c:when>
 				<c:otherwise><c:set var="tourClass"></c:set></c:otherwise></c:choose>
-				
+
 				<a href="<c:out value='${lessonlink.url}'/>"  ${tourClass} style="padding-left: 10px; padding-right:10px;"
 					<c:if test="${not empty lessonlink.tooltip}">
 						title="<fmt:message key='${lessonlink.tooltip}'/>"
@@ -39,4 +39,4 @@
 		</div>
 		<c:set var="addTourClass" value="false" />
 	</div>
-</c:forEach>
+</c:forEach>
\ No newline at end of file
Index: lams_central/web/groupHeader.jsp
===================================================================
diff -u -r56857f6d73efbd7089c7e1d5a682e0716cad12eb -r0d3d616005d7854944b57c0b56613454068f28bc
--- lams_central/web/groupHeader.jsp	(.../groupHeader.jsp)	(revision 56857f6d73efbd7089c7e1d5a682e0716cad12eb)
+++ lams_central/web/groupHeader.jsp	(.../groupHeader.jsp)	(revision 0d3d616005d7854944b57c0b56613454068f28bc)
@@ -1,13 +1,13 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <!-- Add More options menu drop down first (if it contains links) -->
-<c:if test="${not empty org.moreLinks}">
+<c:if test="${not empty pageScope.org.moreLinks}">
 	<!-- bootstrap More options dropdown -->
 	<div class="course-right-buttons pull-right">
 	<div class="btn-group">
 		<button type="button" class="btn btn-primary btn-sm dropdown-toggle ${addTourClass?'tour-more-options':''}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="<fmt:message key="index.moreActions" />"><i class="fa fa-fw fa-ellipsis-v"></i></button>
 	  <ul id="more-links-menu" class="dropdown-menu">
-		<c:forEach var="link" items="${org.moreLinks}">
+		<c:forEach var="link" items="${pageScope.org.moreLinks}">
 			 <li onClick="${link.url}"
 	                      <c:if test="${not empty link.tooltip}">
 	                          title="<fmt:message key='${link.tooltip}'/>"
@@ -22,7 +22,7 @@
 	<!-- end bootstrap More options dropdown -->
 </c:if> 
 
-<c:forEach var="link" items="${org.links}">
+<c:forEach var="link" items="${pageScope.org.links}">
 	<c:choose>
 		<c:when test="${link.name eq 'index.addlesson.single'}">
 			<div class="course-right-buttons pull-right">
@@ -109,4 +109,4 @@
 			</div>
 		</c:otherwise>
 	</c:choose>
-</c:forEach>
+</c:forEach>
\ No newline at end of file