Index: lams_central/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r561bb65551f1a629adc974c1fb2d48e42e764115 -r572226a47e63b49ca60f35de579ec230feaa409a
--- lams_central/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
+++ lams_central/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 572226a47e63b49ca60f35de579ec230feaa409a)
@@ -50,7 +50,7 @@
 <fmt:message var="title" key='activity.title'/>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" refresh="${refresh}">
-	<div class="container-lg">
+	<div id="container-main">
 		<lams:Alert5 type="info" id="define-later-info" close="false">
 			<fmt:message key="${defineLaterLabel}" />
 		</lams:Alert5>
Index: lams_central/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r32e877132f7e519d92b99f234e69b78b9a11b142 -r572226a47e63b49ca60f35de579ec230feaa409a
--- lams_central/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 32e877132f7e519d92b99f234e69b78b9a11b142)
+++ lams_central/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 572226a47e63b49ca60f35de579ec230feaa409a)
@@ -55,20 +55,20 @@
 		}
 	</script>
 	
-	<div id="instructions" class="instructions">
-		<lams:out value="${instructions}" escapeHtml="true" />
-	</div>
-
-	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
-		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
-			<form:hidden path="${hiddenInput}" />
-		</c:forTokens>	
+	<div id="container-main">
+		<div id="instructions" class="instructions">
+			<lams:out value="${instructions}" escapeHtml="true" />
+		</div>
+	
+		<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+			<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
+				<form:hidden path="${hiddenInput}" />
+			</c:forTokens>	
+					
+			<lams:errors5/>
 			
-		<lams:errors5/>
-		
-		<div class="container-lg">
 			<div class="card lcard">
-				<div class="card-header lcard-header-button-border">
+				<div class="card-header">
 					<fmt:message key="${notebookLabelKey}" />
 				</div>
 				<div class="card-body mb-3">
@@ -78,7 +78,7 @@
 						cssClass="form-control" id="focused" rows="5"></form:textarea>
 				</div>
 			</div>
-	
+		
 			<div class="activity-bottom-buttons">
 				<button name="finishButton" id="finish-button" class="btn btn-primary na">
 					<c:choose>
@@ -91,18 +91,17 @@
 					</c:choose>
 				</buttun>
 			</div>
-		</div>
-	</form:form>
-	
-	<c:if test="${isNbTool}">
-		<!-- Comments: the extra div counteracts the float -->
-		<c:if test="${allowComments}">
-			<div class="row g-0"><div class="col-12"></div></div>
-			<lams:Comments toolSessionId="${toolSessionID}"
-						   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
-						   pageSize="10" sortBy="1" />
+		</form:form>
+		
+		<!-- Comments -->
+		<c:if test="${isNbTool}">
+			<c:if test="${allowComments}">
+				<div class="row g-0"><div class="col-12"></div></div>
+				<lams:Comments toolSessionId="${toolSessionID}"
+							   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
+							   pageSize="10" sortBy="1" />
+			</c:if>
 		</c:if>
-		<!-- End comments -->
-	</c:if>
+	</div>
 
 </lams:PageLearner>
Index: lams_central/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r561bb65551f1a629adc974c1fb2d48e42e764115 -r572226a47e63b49ca60f35de579ec230feaa409a
--- lams_central/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
+++ lams_central/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 572226a47e63b49ca60f35de579ec230feaa409a)
@@ -1,12 +1,16 @@
 <%@ tag body-content="scriptless" %>
-<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
-<%@ attribute name="title" required="false" rtexprvalue="true"%>
-<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
-
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideHeaderAndSidebar" required="false" rtexprvalue="true"%>
+<c:if test="${empty hideHeaderAndSidebar}">
+	<c:set var="hideHeaderAndSidebar" value="false" />
+</c:if>
+
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
 <c:choose>
@@ -55,7 +59,9 @@
                 decoderDiv = $('<div />');
 
             $(document).ready(function (){
-                initLearnerPage(${toolSessionID});
+            	<c:if test="${!hideHeaderAndSidebar}">
+                	initLearnerPage(${toolSessionID});
+                </c:if>
             });
 
             function preventLearnerAutosaveFromMultipleTabs(autosaveInterval) {
@@ -75,6 +81,7 @@
 
     <body class="component">
     <div class="component-page-wrapper">
+    	<c:if test="${!hideHeaderAndSidebar}">
         <nav inert class="component-sidebar" role="navigation dialog"
              aria-label="Side menu" aria-expanded="false"  aria-modal="true">
             <button class="sidebar-toggle-button no-decoration" aria-labelledby="progress-bar-title">
@@ -94,8 +101,10 @@
             <ul id="progress-bar-items" class="progress-bar-items w-100" role="menu">
             </ul>
         </nav>
+        </c:if>
 
         <div class="component-page-content">
+        	<c:if test="${!hideHeaderAndSidebar}">
             <a href="#component-main-content" class="visually-hidden-focusable p-2">Skip to main content</a>
 
             <header id="header" class="d-flex justify-content-between" role="banner">
@@ -127,14 +136,16 @@
                     </button>
                 </div>
             </header>
+            </c:if>
 
             <main class="p-3" id="component-main-content" tabindex="-1">
                 <c:if test="${not empty title}">
-                    <h2 class="mb-3"><c:out value="${title}" escapeXml="true" /></h2>
+                    <h2 class="mb-3">
+                    	<c:out value="${title}" escapeXml="true" />
+                    </h2>
                 </c:if>
-
+				
                 <jsp:doBody/>
-
             </main>
         </div>
     </div>
Index: lams_central/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -rb682c506270a405ed832364386fa691c9599cbaa -r572226a47e63b49ca60f35de579ec230feaa409a
--- lams_central/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision b682c506270a405ed832364386fa691c9599cbaa)
+++ lams_central/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 572226a47e63b49ca60f35de579ec230feaa409a)
@@ -50,7 +50,7 @@
 		}
     </script>
 
-	<div class="container-lg">
+	<div id="container-main">
 		<lams:Alert5 id="submission-deadline-alert" close="false" type="danger">
 			<fmt:message key="${deadlineAlertLabelKey}">
 				<fmt:param>
Index: lams_central/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u -r8ab1c658eca81a42d7f21d0067bff04c15f70c38 -r572226a47e63b49ca60f35de579ec230feaa409a
--- lams_central/web/WEB-INF/tags/WaitForLeader.tag	(.../WaitForLeader.tag)	(revision 8ab1c658eca81a42d7f21d0067bff04c15f70c38)
+++ lams_central/web/WEB-INF/tags/WaitForLeader.tag	(.../WaitForLeader.tag)	(revision 572226a47e63b49ca60f35de579ec230feaa409a)
@@ -33,7 +33,7 @@
 	</c:if>
 </script>
 
-<div class="container-lg">
+<div id="container-main">
 	<lams:Alert5 id="waiting-for-leader-alert" type="info">
 		<fmt:message key="${waitingForLeaderKey}" />
 	</lams:Alert5>
Index: lams_central/web/css/components.scss
===================================================================
diff -u -r76e983188f512edbc2d0b5e2028f06d8c5692cb7 -r572226a47e63b49ca60f35de579ec230feaa409a
--- lams_central/web/css/components.scss	(.../components.scss)	(revision 76e983188f512edbc2d0b5e2028f06d8c5692cb7)
+++ lams_central/web/css/components.scss	(.../components.scss)	(revision 572226a47e63b49ca60f35de579ec230feaa409a)
@@ -1,3 +1,4 @@
+@use "bootstrap5.custom.scss";
 @import "_lams_variables.scss"; 
 
 /* For Boostrap 3 & 5 compability */
@@ -68,6 +69,10 @@
 	background-color: var(--lams-background-gray);
 }
 
+body.component #container-main {
+    @extend .container-lg;
+}
+
 body.component .btn-success,
 body.component .btn-success:hover {
 	color: #fff;
Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
diff -u -rd182bd3afaf9cdadbe01a5a91589efd765a50bc6 -r572226a47e63b49ca60f35de579ec230feaa409a
--- lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision d182bd3afaf9cdadbe01a5a91589efd765a50bc6)
+++ lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 572226a47e63b49ca60f35de579ec230feaa409a)
@@ -615,7 +615,7 @@
 		}
     </script>
 
-	<div class="container-lg">
+	<div id="container-main">
 		<c:if test="${not empty sessionMap.submissionDeadline && (sessionMap.mode == 'author' || sessionMap.mode == 'learner')}">
 			<lams:Alert5 id="submission-deadline" type="info" close="true">
 				<fmt:message key="authoring.info.teacher.set.restriction" >
Index: lams_tool_assessment/web/pages/learning/results.jsp
===================================================================
diff -u -rd182bd3afaf9cdadbe01a5a91589efd765a50bc6 -r572226a47e63b49ca60f35de579ec230feaa409a
--- lams_tool_assessment/web/pages/learning/results.jsp	(.../results.jsp)	(revision d182bd3afaf9cdadbe01a5a91589efd765a50bc6)
+++ lams_tool_assessment/web/pages/learning/results.jsp	(.../results.jsp)	(revision 572226a47e63b49ca60f35de579ec230feaa409a)
@@ -80,7 +80,7 @@
 		}
     </script>
 	
-	<div class="container-lg">
+	<div id="container-main">
 		<c:if test="${not empty sessionMap.submissionDeadline && (sessionMap.mode == 'author' || sessionMap.mode == 'learner')}">
 			<lams:Alert5 id="submission-deadline" type="info" close="true">
 				<fmt:message key="authoring.info.teacher.set.restriction" >
Index: lams_tool_assessment/web/pages/learning/waitForLeaderTimeLimit.jsp
===================================================================
diff -u -r6866da235d682d74f883afdd01e00e92d16a13eb -r572226a47e63b49ca60f35de579ec230feaa409a
--- lams_tool_assessment/web/pages/learning/waitForLeaderTimeLimit.jsp	(.../waitForLeaderTimeLimit.jsp)	(revision 6866da235d682d74f883afdd01e00e92d16a13eb)
+++ lams_tool_assessment/web/pages/learning/waitForLeaderTimeLimit.jsp	(.../waitForLeaderTimeLimit.jsp)	(revision 572226a47e63b49ca60f35de579ec230feaa409a)
@@ -12,7 +12,7 @@
 		setTimeout("refresh();", 30000);
 	</script>
 
-	<div class="container-lg">
+	<div id="container-main">
 		<lams:Alert5 id="waitingForLeader" type="info" close="false">
 			<fmt:message key="${waitingMessageKey}" />
 		</lams:Alert5>
Index: lams_tool_chat/web/pages/learning/learning.jsp
===================================================================
diff -u -rc7da4cc1741df96dcdf19d62846e95f7e9ddf870 -r572226a47e63b49ca60f35de579ec230feaa409a
--- lams_tool_chat/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision c7da4cc1741df96dcdf19d62846e95f7e9ddf870)
+++ lams_tool_chat/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 572226a47e63b49ca60f35de579ec230feaa409a)
@@ -30,7 +30,7 @@
 	<lams:JSImport src="includes/javascript/portrait5.js" />
 	<lams:JSImport src="includes/javascript/learning.js" relative="true" />
 	
-	<div class="container-lg">
+	<div id="container-main">
 		<div id="instructions" class="instructions">
 			<c:out value="${chatDTO.instructions}" escapeXml="false" />
 		</div>
Index: lams_tool_images/web/pages/learning/learning.jsp
===================================================================
diff -u -r8de3eaa9202afa22c16447d5236943cbe4749eb1 -r572226a47e63b49ca60f35de579ec230feaa409a
--- lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 8de3eaa9202afa22c16447d5236943cbe4749eb1)
+++ lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 572226a47e63b49ca60f35de579ec230feaa409a)
@@ -142,7 +142,7 @@
 			);
 		}	
     </script>
-	<div class="container-lg">
+	<div id="container-main">
 	
 		<%--Advanced settings and notices-----------------------------------%>
 		<div id="instructions" class="instructions">
Index: lams_tool_lamc/web/learning/AnswersContent.jsp
===================================================================
diff -u -rd43d1e67bb589b4f565a222a3f33ea17debc68a7 -r572226a47e63b49ca60f35de579ec230feaa409a
--- lams_tool_lamc/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision d43d1e67bb589b4f565a222a3f33ea17debc68a7)
+++ lams_tool_lamc/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 572226a47e63b49ca60f35de579ec230feaa409a)
@@ -113,8 +113,7 @@
         }
       </script>
 
-	<div class="container-lg">
-
+	<div id="container-main">
 		<div id="instructions" class="instructions">
 			<c:out value="${mcGeneralLearnerFlowDTO.activityInstructions}" escapeXml="false" />
 		</div>
Index: lams_tool_lamc/web/learning/ViewAnswers.jsp
===================================================================
diff -u -rd43d1e67bb589b4f565a222a3f33ea17debc68a7 -r572226a47e63b49ca60f35de579ec230feaa409a
--- lams_tool_lamc/web/learning/ViewAnswers.jsp	(.../ViewAnswers.jsp)	(revision d43d1e67bb589b4f565a222a3f33ea17debc68a7)
+++ lams_tool_lamc/web/learning/ViewAnswers.jsp	(.../ViewAnswers.jsp)	(revision 572226a47e63b49ca60f35de579ec230feaa409a)
@@ -40,7 +40,7 @@
 		}
 	</script>
 
-	<div class="container-lg">
+	<div id="container-main">
 	<form:form action="displayMc.do" method="POST" target="_self" onsubmit="disableFinishButton();" modelAttribute="mcLearningForm" id="mcLearningForm">
 
 		<c:if test="${isLeadershipEnabled}">
Index: lams_tool_laqa/web/learning/AnswersContent.jsp
===================================================================
diff -u -r7f1d981e3b4b708e15c8cd5bc1cfcf740cec666f -r572226a47e63b49ca60f35de579ec230feaa409a
--- lams_tool_laqa/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 7f1d981e3b4b708e15c8cd5bc1cfcf740cec666f)
+++ lams_tool_laqa/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 572226a47e63b49ca60f35de579ec230feaa409a)
@@ -22,12 +22,13 @@
 			font-size: 18px;
 		}
 	</style>
+	
+	<div id="container-main">
 
-	<div id="instructions" class="instructions" aria-label="<fmt:message key='label.authoring.instructions'/>">
-		<c:out value="${generalLearnerFlowDTO.activityInstructions}" escapeXml="false" />
-	</div>
+		<div id="instructions" class="instructions" aria-label="<fmt:message key='label.authoring.instructions'/>">
+			<c:out value="${generalLearnerFlowDTO.activityInstructions}" escapeXml="false" />
+		</div>
 
-	<div class="container-lg">
 		<!-- form needs to be outside page so that the form bean can be picked up by Page tag. -->
 		<form:form action="${generalLearnerFlowDTO.questionListingMode == 'questionListingModeSequential' ? 'getNextQuestion.do' : 'submitAnswersContent.do'}"
 				   method="POST" target="_self" id="qaLearningForm" modelAttribute="qaLearningForm">
Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -r7f1d981e3b4b708e15c8cd5bc1cfcf740cec666f -r572226a47e63b49ca60f35de579ec230feaa409a
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 7f1d981e3b4b708e15c8cd5bc1cfcf740cec666f)
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 572226a47e63b49ca60f35de579ec230feaa409a)
@@ -3,7 +3,7 @@
 <c:set var="sessionMap" value="${sessionScope[generalLearnerFlowDTO.sessionMapID]}" />
 
 <lams:PageLearner title="${generalLearnerFlowDTO.activityTitle}" toolSessionID="${qaLearningForm.toolSessionID}" >
-	<div class="container-lg">
+	<div id="container-main">
 		
 		<!-- form needs to be outside page so that the form bean can be picked up by Page tag. -->
 		<form:form action="/lams/tool/laqa11/learning/learning.do" method="POST" modelAttribute="qaLearningForm" target="_self">
Index: lams_tool_leader/web/pages/learning/leaderselection.jsp
===================================================================
diff -u -r261520f042046fcb6f4f85c596495e3ea98311aa -r572226a47e63b49ca60f35de579ec230feaa409a
--- lams_tool_leader/web/pages/learning/leaderselection.jsp	(.../leaderselection.jsp)	(revision 261520f042046fcb6f4f85c596495e3ea98311aa)
+++ lams_tool_leader/web/pages/learning/leaderselection.jsp	(.../leaderselection.jsp)	(revision 572226a47e63b49ca60f35de579ec230feaa409a)
@@ -93,7 +93,7 @@
 			};
 	</script>
 
-	<div class="container-lg">
+	<div id="container-main">
 		<c:choose>
 			<c:when test="${not empty groupLeader}">
 				<lams:LeaderDisplay
Index: lams_tool_notebook/web/pages/learning/notebook.jsp
===================================================================
diff -u -r8ab1c658eca81a42d7f21d0067bff04c15f70c38 -r572226a47e63b49ca60f35de579ec230feaa409a
--- lams_tool_notebook/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 8ab1c658eca81a42d7f21d0067bff04c15f70c38)
+++ lams_tool_notebook/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 572226a47e63b49ca60f35de579ec230feaa409a)
@@ -84,7 +84,7 @@
 			}
 		</script>
 
-	<div class="container-lg">
+	<div id="container-main">
 	<form:form action="learning/finishActivity.do" method="post" modelAttribute="messageForm" id="messageForm">
 		<form:hidden path="toolSessionID" />
 		<form:hidden path="contentEditable" value="${contentEditable}" />
Index: lams_tool_preview/web/pages/learning/learning.jsp
===================================================================
diff -u -ra08fb689e1bb174869cb981d301b204d2f573590 -r572226a47e63b49ca60f35de579ec230feaa409a
--- lams_tool_preview/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision a08fb689e1bb174869cb981d301b204d2f573590)
+++ lams_tool_preview/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 572226a47e63b49ca60f35de579ec230feaa409a)
@@ -66,7 +66,7 @@
 		}
 	</script>
 
-	<div class="container-lg">
+	<div id="container-main">
 		<c:if test="${sessionMap.lockOnFinish and mode != 'teacher'}">
 			<lams:Alert5 type="danger" id="warn-lock" close="false">
 				<c:choose>
Index: lams_tool_preview/web/pages/learning/learningHiddenUser.jsp
===================================================================
diff -u -ra08fb689e1bb174869cb981d301b204d2f573590 -r572226a47e63b49ca60f35de579ec230feaa409a
--- lams_tool_preview/web/pages/learning/learningHiddenUser.jsp	(.../learningHiddenUser.jsp)	(revision a08fb689e1bb174869cb981d301b204d2f573590)
+++ lams_tool_preview/web/pages/learning/learningHiddenUser.jsp	(.../learningHiddenUser.jsp)	(revision 572226a47e63b49ca60f35de579ec230feaa409a)
@@ -10,7 +10,7 @@
 		}
      </script>
 	
-	<div class="container-lg">
+	<div id="container-main">
 		<lams:Alert5 type="info" id="removed-user-info" close="false">
 			<fmt:message key="label.removed.user.warning" />
 		</lams:Alert5>
Index: lams_tool_preview/web/pages/learning/results.jsp
===================================================================
diff -u -ra08fb689e1bb174869cb981d301b204d2f573590 -r572226a47e63b49ca60f35de579ec230feaa409a
--- lams_tool_preview/web/pages/learning/results.jsp	(.../results.jsp)	(revision a08fb689e1bb174869cb981d301b204d2f573590)
+++ lams_tool_preview/web/pages/learning/results.jsp	(.../results.jsp)	(revision 572226a47e63b49ca60f35de579ec230feaa409a)
@@ -84,7 +84,7 @@
 		}
     </script>
 
-<div class="container-lg">
+<div id="container-main">
 	<c:if test="${sessionMap.lockOnFinish and mode != 'teacher'}">
 		<lams:Alert5 type="danger" id="warn-lock" close="false">
 			<c:choose>
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
diff -u -r06e23148d7117850d0cac691eccb07f2d3b13e79 -r572226a47e63b49ca60f35de579ec230feaa409a
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 06e23148d7117850d0cac691eccb07f2d3b13e79)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 572226a47e63b49ca60f35de579ec230feaa409a)
@@ -37,11 +37,11 @@
 		</c:when>
 	</c:choose>
 
-	<div id="instructions" class="instructions" aria-label="<fmt:message key='label.authoring.basic.instruction'/>">
-		<c:out value="${sessionMap.instruction}" escapeXml="false" />
-	</div>
+	<div id="container-main">
+		<div id="instructions" class="instructions" aria-label="<fmt:message key='label.authoring.basic.instruction'/>">
+			<c:out value="${sessionMap.instruction}" escapeXml="false" />
+		</div>
 
-	<div class="container-lg">
 		<div id="notices">
 			<!-- notices and announcements -->
 			<c:if test="${(sessionMap.mode == 'author' || sessionMap.mode == 'learner') && hasEditRight}">
Index: lams_tool_scratchie/web/pages/learning/learning.jsp
===================================================================
diff -u -r8ab1c658eca81a42d7f21d0067bff04c15f70c38 -r572226a47e63b49ca60f35de579ec230feaa409a
--- lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 8ab1c658eca81a42d7f21d0067bff04c15f70c38)
+++ lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 572226a47e63b49ca60f35de579ec230feaa409a)
@@ -524,7 +524,7 @@
 		}
     </script>
 
-	<div class="container-lg">
+	<div id="container-main">
 		<lams:LeaderDisplay username="${sessionMap.groupLeaderName}" userId="${sessionMap.groupLeaderUserId}"/>
 
 		<c:if test="${sessionMap.userFinished && (mode == 'teacher')}">
Index: lams_tool_scratchie/web/pages/learning/results.jsp
===================================================================
diff -u -r261520f042046fcb6f4f85c596495e3ea98311aa -r572226a47e63b49ca60f35de579ec230feaa409a
--- lams_tool_scratchie/web/pages/learning/results.jsp	(.../results.jsp)	(revision 261520f042046fcb6f4f85c596495e3ea98311aa)
+++ lams_tool_scratchie/web/pages/learning/results.jsp	(.../results.jsp)	(revision 572226a47e63b49ca60f35de579ec230feaa409a)
@@ -341,7 +341,7 @@
 		}
     </script>
 
-	<div class="container-lg">
+	<div id="container-main">
 		<c:if test="${not empty sessionMap.submissionDeadline}">
 			<lams:Alert5 id="submissionDeadline">
 				<fmt:message key="authoring.info.teacher.set.restriction">
Index: lams_tool_scratchie/web/pages/learning/waitForLeaderTimeLimit.jsp
===================================================================
diff -u -r5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10 -r572226a47e63b49ca60f35de579ec230feaa409a
--- lams_tool_scratchie/web/pages/learning/waitForLeaderTimeLimit.jsp	(.../waitForLeaderTimeLimit.jsp)	(revision 5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10)
+++ lams_tool_scratchie/web/pages/learning/waitForLeaderTimeLimit.jsp	(.../waitForLeaderTimeLimit.jsp)	(revision 572226a47e63b49ca60f35de579ec230feaa409a)
@@ -12,7 +12,7 @@
 		setTimeout("refresh();", 30000);
 	</script>
 
-	<div class="container-lg">
+	<div id="container-main">
 		<lams:Alert5 id="waitingForLeader" type="info" close="false">
 			<fmt:message key="${waitingMessageKey}" />
 		</lams:Alert5>