Index: lams_central/web/css/_learner_base.scss
===================================================================
diff -u -ra8263ea52078fa1af6b0ce96f77bac8e3427849e -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_central/web/css/_learner_base.scss	(.../_learner_base.scss)	(revision a8263ea52078fa1af6b0ce96f77bac8e3427849e)
+++ lams_central/web/css/_learner_base.scss	(.../_learner_base.scss)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -1042,13 +1042,6 @@
 	@include portrait-generic($portrait-size-image-xl, 400px);
 }
 
-.leader-display {
-	margin: 0px;
-	h4 {
-	    margin-bottom: 0px;
-	}
-}
-
 // Popovers used in Gradebook to display portraits
 // popover links forced to be the usual link color or jqgrid can interfere
 .popover-link {
Index: lams_central/web/css/components.scss
===================================================================
diff -u -ra8263ea52078fa1af6b0ce96f77bac8e3427849e -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_central/web/css/components.scss	(.../components.scss)	(revision a8263ea52078fa1af6b0ce96f77bac8e3427849e)
+++ lams_central/web/css/components.scss	(.../components.scss)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -185,14 +185,6 @@
 	margin-top: 3px;
 }
 
-body.component .leader-display {
-	margin: 0px;
-}
-
-body.component .leader-display h4 {
-	margin-bottom: 0px;
-}
-
 body.component .popover-link {
 	color: var(--bs-blue) !important;
 }
@@ -230,6 +222,7 @@
 	color: var(--bs-blue);
 }
 
+/* lineheight setting to use on the name if it is next to portrait, as generated by the Portrait tag. e.g. in Peer Review*/
 body.component .portrait-sm-lineheight {
 	line-height: 32px;
 	vertical-align: top;
@@ -587,89 +580,6 @@
     vertical-align: middle;
 }
 
-/* User Photo / Avatar*/
-$portrait-size-image-sm: 35px;
-$portrait-size-image-md: 80px;
-$portrait-size-image-lg: 200px;
-$portrait-size-image-xl: 400px;
-
-.portrait-round {
-	border-radius:50%;
-}
-
-.portrait-sm {
-	@include portrait($portrait-size-image-sm);
-}
-
-.portrait-md {
-	@include portrait($portrait-size-image-md);
-}
-
-.portrait-lg {
-	@include portrait($portrait-size-image-lg);
-}
-
-.portrait-xl {
-	@include portrait($portrait-size-image-xl);
-}
-
-.portrait-container-sm {
-	height: $portrait-size-image-sm + 3;
-	margin-top: $border-radius-small;
-}
-
-/* Used in PortraitTag.java when user does not have a portrait */
-.portrait-color-0 {
-	color:$portrait-color-0;
-}
-.portrait-color-1 {
-	color:$portrait-color-1;
-}
-.portrait-color-2 {
-	color:$portrait-color-2;
-}
-.portrait-color-3 {
-	color:$portrait-color-3;
-}
-.portrait-color-4 {
-	color:$portrait-color-4;
-}
-.portrait-color-5 {
-	color:$portrait-color-5;
-}
-.portrait-color-6 {
-	color:$portrait-color-6;
-}
-
-/* lineheight setting to use on the name if it is next to portrait, as generated by the Portrait tag. e.g. in Peer Review*/
-.portrait-sm-lineheight {
-	line-height: 32px;
-	vertical-align: top;
-}
-
-.portrait-generic-sm {
-	@include portrait-generic($portrait-size-image-sm, 35px);
-}
-
-.portrait-generic-md {
-	@include portrait-generic($portrait-size-image-md, 65px);
-}
-
-.portrait-generic-lg {
-	@include portrait-generic($portrait-size-image-lg, 200px);
-}
-
-.portrait-generic-xl {
-	@include portrait-generic($portrait-size-image-xl, 400px);
-}
-
-.leader-display {
-	margin: 0px;
-	h4 {
-	    margin-bottom: 0px;
-	}
-}
-
 // Ratings
 .rating-comment{
 	background-image: none;
Index: lams_learning/web/branching/preview.jsp
===================================================================
diff -u -r21f82ef5c6ab672a3ad2848d330824c97b877738 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_learning/web/branching/preview.jsp	(.../preview.jsp)	(revision 21f82ef5c6ab672a3ad2848d330824c97b877738)
+++ lams_learning/web/branching/preview.jsp	(.../preview.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -141,7 +141,7 @@
 					<input type="hidden" name="activityID" value="${branchingForm.activityID}">
 					<input type="hidden" name="progressID" value="${branchingForm.progressID}">
 			
-					<button class="btn btn-primary pull-left na" onclick="finishActivity()">
+					<button class="btn btn-primary float-start na" onclick="finishActivity()">
 						<fmt:message key="label.finish.button" />
 					</button>
 			
Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
diff -u -rcfd463431d2171b40403dcff2508408e72685c0e -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision cfd463431d2171b40403dcff2508408e72685c0e)
+++ lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -686,12 +686,10 @@
 		</div>
 
 		<c:if test="${mode != 'teacher'}">
-			<div class="space-bottom-top align-right">
-				<c:if test="${hasEditRight}">					
+			<div class="activity-bottom-buttons">
+				<c:if test="${hasEditRight}">
 					<button type="button" name="submitAll"
-							onclick="return submitAll(false);" 
-							class="btn btn-primary voffset10 pull-right na"
-							>
+						onclick="return submitAll(false);" class="btn btn-primary na">
 						<fmt:message key="label.learning.submit.all" />
 					</button>
 				</c:if>
Index: lams_tool_assessment/web/pages/learning/notebook.jsp
===================================================================
diff -u -rd5fa41792bdb2657d0d53c35126a64604510d18a -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_assessment/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision d5fa41792bdb2657d0d53c35126a64604510d18a)
+++ lams_tool_assessment/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -40,7 +40,7 @@
 
 			<form:textarea rows="5" path="entryText" cssClass="form-control" id="focused" />
 
-			<button type="submit" class="btn btn-primary voffset10 pull-right na" id="finishButton">
+			<button type="submit" class="btn btn-primary voffset10 float-end na" id="finishButton">
 				<c:choose>
 					<c:when test="${sessionMap.isLastActivity}">
 						<fmt:message key="label.submit" />
Index: lams_tool_assessment/web/pages/learning/parts/allquestions.jsp
===================================================================
diff -u -r9ff1812d86a48db3faa6579f8977464d944776f7 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_assessment/web/pages/learning/parts/allquestions.jsp	(.../allquestions.jsp)	(revision 9ff1812d86a48db3faa6579f8977464d944776f7)
+++ lams_tool_assessment/web/pages/learning/parts/allquestions.jsp	(.../allquestions.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -27,15 +27,15 @@
 				</h3>
 
 				<c:if test="${assessment.displayMaxMark}">
-					<span class="pull-right small loffset10" style="padding-top: 3px">
+					<span class="float-end small loffset10" style="padding-top: 3px">
 						<fmt:message key="label.learning.max.mark">
 							<fmt:param value="${question.maxMark}" />
 						</fmt:message>
 					</span>
 				</c:if>
 									
 				<c:if test="${question.answerRequired}">
-					<span class="asterisk pull-right">
+					<span class="asterisk float-end">
 						<i class="fa fa-xs fa-asterisk text-danger" title="<fmt:message key="label.answer.required"/>" 
 								alt="<fmt:message key="label.answer.required"/>"></i>
 					</span>
Index: lams_tool_assessment/web/pages/learning/parts/markhedging.jsp
===================================================================
diff -u -r10e6a1f74ecf6ba2d60569e9b9677b88ed39650a -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_assessment/web/pages/learning/parts/markhedging.jsp	(.../markhedging.jsp)	(revision 10e6a1f74ecf6ba2d60569e9b9677b88ed39650a)
+++ lams_tool_assessment/web/pages/learning/parts/markhedging.jsp	(.../markhedging.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -35,7 +35,7 @@
 <c:if test="${isLeadershipEnabled && isUserLeader}">
 	<div class="float-right">
 		<button type="button" name="submit-hedging-question${questionIndex}" onclick="return submitSingleMarkHedgingQuestion(${question.uid}, ${questionIndex});" 
-				class="btn pull-right">
+				class="btn float-end">
 			<fmt:message key="label.learning.submit" />
 		</button>
 	</div>
Index: lams_tool_assessment/web/pages/learning/results.jsp
===================================================================
diff -u -rd5fa41792bdb2657d0d53c35126a64604510d18a -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_assessment/web/pages/learning/results.jsp	(.../results.jsp)	(revision d5fa41792bdb2657d0d53c35126a64604510d18a)
+++ lams_tool_assessment/web/pages/learning/results.jsp	(.../results.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -160,7 +160,7 @@
 			
 						<c:if test="${(mode != 'teacher') && hasEditRight}">
 							<button type="button" name="FinishButton" onclick="return continueReflect()" 
-									class="btn btn-sm btn-default pull-left voffset10">
+									class="btn btn-sm btn-secondary float-start voffset10">
 								<fmt:message key="label.edit" />
 							</button>
 						</c:if>
@@ -171,7 +171,7 @@
 		</c:if>
 
 		<c:if test="${mode != 'teacher'}">
-			<div class="space-bottom-top align-right">
+			<div class="activity-bottom-buttons">
 				<c:if test="${isResubmitAllowed && hasEditRight}">
 					<button type="submit" onclick="resubmit()" class="btn btn-default">
 						<fmt:message key="label.learning.resubmit" />
@@ -182,15 +182,15 @@
 					<c:choose>
 						<c:when	test="${sessionMap.reflectOn && (not sessionMap.userFinished) && hasEditRight}">
 							<button type="button" name="FinishButton" onclick="return continueReflect()" 
-									class="btn btn-primary voffset10 pull-right na">
+									class="btn btn-primary na">
 								<fmt:message key="label.continue" />
 							</button>
 						</c:when>
 						
 						<c:otherwise>
 							<button id="finishButton"
 							        name="FinishButton"
-									class="btn btn-primary voffset10 pull-right na">
+									class="btn btn-primary na">
 								<span class="nextActivity">
 									<c:choose>
 										<c:when test="${sessionMap.isLastActivity}">
Index: lams_tool_assessment/web/pages/learning/results/allquestions.jsp
===================================================================
diff -u -rcfd463431d2171b40403dcff2508408e72685c0e -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_assessment/web/pages/learning/results/allquestions.jsp	(.../allquestions.jsp)	(revision cfd463431d2171b40403dcff2508408e72685c0e)
+++ lams_tool_assessment/web/pages/learning/results/allquestions.jsp	(.../allquestions.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -194,15 +194,15 @@
 			</c:if>
 			
 			<c:if test="${assessment.displayMaxMark}">
-				<span class="pull-right small loffset10" style="padding-top: 3px">
+				<span class="float-end small loffset10" style="padding-top: 3px">
 					<fmt:message key="label.learning.max.mark">
 						<fmt:param value="${question.maxMark}" />
 					</fmt:message>
 				</span>
 			</c:if>
 				
 			<c:if test="${question.answerRequired}">
-				<span class="asterisk pull-right">
+				<span class="asterisk float-end">
 					<i class="fa fa-xs fa-asterisk text-danger" title="<fmt:message key="label.answer.required"/>" 
 							alt="<fmt:message key="label.answer.required"/>"></i>
 				</span>
Index: lams_tool_assessment/web/pages/learning/results/essay.jsp
===================================================================
diff -u -rf5bcf9323324eb4d5add901d9e7a23c33050533a -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_assessment/web/pages/learning/results/essay.jsp	(.../essay.jsp)	(revision f5bcf9323324eb4d5add901d9e7a23c33050533a)
+++ lams_tool_assessment/web/pages/learning/results/essay.jsp	(.../essay.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -29,7 +29,7 @@
 			<td colspan="2" class="text-center">
 				<b><fmt:message key="label.learning.summary.other.team.answers"/></b>
 				<c:if test="${question.groupsAnswersDisclosed and not empty toolSessionID}">
-					<button type="button" class="btn btn-xs btn-default pull-right" onClick="javascript:refreshToRating(${question.uid})">
+					<button type="button" class="btn btn-xs btn-default float-end" onClick="javascript:refreshToRating(${question.uid})">
 						<fmt:message key="label.refresh"/>
 					</button>
 				</c:if>
Index: lams_tool_assessment/web/pages/learning/submissionDeadline.jsp
===================================================================
diff -u -rc1d637e4d2786f97672dd38f6e3278d5c4f7b79c -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_assessment/web/pages/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision c1d637e4d2786f97672dd38f6e3278d5c4f7b79c)
+++ lams_tool_assessment/web/pages/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -27,7 +27,7 @@
 		</lams:Alert>
 	
 		<a href="#nogo" name="FinishButton" id="finishButton"
-				onclick="return finishSession()" class="btn btn-primary voffset10 pull-right na">
+				onclick="return finishSession()" class="btn btn-primary voffset10 float-end na">
 			<c:choose>
 				<c:when test="${sessionMap.isLastActivity}">
 					<fmt:message key="label.submit" />
Index: lams_tool_assessment/web/pages/learning/waitForLeaderTimeLimit.jsp
===================================================================
diff -u -r4353f26f9509808acdf41d0deef6cf5fd458a2b7 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_assessment/web/pages/learning/waitForLeaderTimeLimit.jsp	(.../waitForLeaderTimeLimit.jsp)	(revision 4353f26f9509808acdf41d0deef6cf5fd458a2b7)
+++ lams_tool_assessment/web/pages/learning/waitForLeaderTimeLimit.jsp	(.../waitForLeaderTimeLimit.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -25,9 +25,11 @@
 			<fmt:message key="${waitingMessageKey}" />
 		</h4>
 		
-		<button type="button" name="refreshButton" onclick="refresh();" class="btn btn-sm btn-primary pull-right">
-			<fmt:message key="label.refresh" />
-		</button>
+		<div class="activity-bottom-buttons">
+			<button type="button" name="refreshButton" onclick="refresh();" class="btn btn-primary">
+				<fmt:message key="label.refresh" />
+			</button>
+		</div>
 
 	</lams:Page>
 
Index: lams_tool_chat/web/pages/learning/learning.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_chat/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_chat/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -67,7 +67,7 @@
 					<div id="messages"></div>
 				</div>
 				<div class="col-xs-12 col-sm-3 col-md-3 col-lg-4">
-					<div id="roster" class="hidden-xs"></div>
+					<div id="roster" class="d-none d-sm-block"></div>
 				</div>
 			</div>
 			<c:if test="${MODE == 'teacher'}">
Index: lams_tool_chat/web/pages/learning/notebook.jsp
===================================================================
diff -u -rd5fa41792bdb2657d0d53c35126a64604510d18a -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_chat/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision d5fa41792bdb2657d0d53c35126a64604510d18a)
+++ lams_tool_chat/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -46,7 +46,7 @@
 					<form:textarea rows="5" path="entryText" cssClass="form-control" id="focused"></form:textarea>
 			
 					<form:hidden path="chatUserUID" />
-					<a href="#nogo" class="btn btn-primary pull-right voffset10 na" id="finishButton">
+					<a href="#nogo" class="btn btn-primary float-end voffset10 na" id="finishButton">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="button.submit" />
Index: lams_tool_chat/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u -r47dddf6db4afaba99d8f3f88fc50b16df9251a76 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_chat/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 47dddf6db4afaba99d8f3f88fc50b16df9251a76)
+++ lams_tool_chat/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -52,7 +52,7 @@
 			<form:form action="openNotebook.do" method="post"
 			onsubmit="disableFinishButton();"  modelAttribute="learningForm" id="learningForm">
 			<form:hidden path="chatUserUID" value="${chatUserDTO.uid}" />
-			<input type="submit" value="<fmt:message key="button.continue" />" class="btn btn-responsive btn-primary pull-right voffset10"/>
+			<input type="submit" value="<fmt:message key="button.continue" />" class="btn btn-responsive btn-primary float-end voffset10"/>
 			</form:form>
 		
 		</c:when>
@@ -61,7 +61,7 @@
 			<form:form action="finishActivity.do" method="post"
 			onsubmit="disableFinishButton();"  modelAttribute="learningForm" id="learningForm">
 			<form:hidden path="chatUserUID" value="${chatUserDTO.uid}" />
-			<a href="#nogo" type="button" class="btn btn-primary pull-right voffset10 na btn-autoresize" id="finishButton">
+			<a href="#nogo" type="button" class="btn btn-primary float-end voffset10 na btn-autoresize" id="finishButton">
 						 <span class="nextActivity">
 							 <c:choose>
 							 	<c:when test="${isLastActivity}">
Index: lams_tool_daco/web/pages/learning/addRecord.jsp
===================================================================
diff -u -rdee1313f3a1d0a71354604278d1bfc6cb9d49a9d -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_daco/web/pages/learning/addRecord.jsp	(.../addRecord.jsp)	(revision dee1313f3a1d0a71354604278d1bfc6cb9d49a9d)
+++ lams_tool_daco/web/pages/learning/addRecord.jsp	(.../addRecord.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -250,7 +250,7 @@
 			<tr>
 				<td>
 					<c:if test="${mode != 'teacher'}">
-						<button type="submit" onclick="return saveOrUpdateRecord();" class="btn btn-sm btn-default btn-disable-on-submit voffset5 pull-left"><i class="fa fa-plus"></i> <fmt:message key="label.learning.add" /></button>
+						<button type="submit" onclick="return saveOrUpdateRecord();" class="btn btn-sm btn-secondary btn-disable-on-submit voffset5 float-start"><i class="fa fa-plus"></i> <fmt:message key="label.learning.add" /></button>
 					</c:if>
 					<c:if test="${horizontal}">
 					</td><td style="vertical-align: middle;">
@@ -287,7 +287,7 @@
 			</div>
 
 			<c:if test="${mode != 'teacher'}">
-				<button name="FinishButton" onclick="javascript:continueReflect()" class="btn btn-default pull-left">
+				<button name="FinishButton" onclick="javascript:continueReflect()" class="btn btn-default float-start">
 					<fmt:message key="label.common.edit" />
 				</button>
 			</c:if>
Index: lams_tool_daco/web/pages/learning/learning.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_daco/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_daco/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -102,12 +102,12 @@
 <c:if test="${mode != 'teacher'}">
 		<c:choose>
 			<c:when test="${daco.reflectOnActivity && (not sessionMap.userFinished)}">
-				<button name="FinishButton" onclick="javascript:continueReflect()" class="btn btn-default btn-disable-on-submit voffset5 pull-right">
+				<button name="FinishButton" onclick="javascript:continueReflect()" class="btn btn-default btn-disable-on-submit voffset5 float-end">
 					<fmt:message key="label.learning.continue" />
 				</button>
 			</c:when>
 			<c:otherwise>
-				<button type="submit" name="FinishButton" id="finishButton" class="btn btn-primary btn-disable-on-submit voffset5 pull-right na">
+				<button type="submit" name="FinishButton" id="finishButton" class="btn btn-primary btn-disable-on-submit voffset5 float-end na">
 					<c:choose>
 		 					<c:when test="${sessionMap.isLastActivity}">
 		 						<fmt:message key="label.learning.submit" />
Index: lams_tool_daco/web/pages/learning/listRecords.jsp
===================================================================
diff -u -r2de8f805211b6433aff4efd6fa9275a1b9933033 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_daco/web/pages/learning/listRecords.jsp	(.../listRecords.jsp)	(revision 2de8f805211b6433aff4efd6fa9275a1b9933033)
+++ lams_tool_daco/web/pages/learning/listRecords.jsp	(.../listRecords.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -122,9 +122,9 @@
 						<fmt:message key="label.learning.heading.recordnumber" />&nbsp;${recordStatus.index+1}
 						<c:if test='${includeMode=="learning" and not finishedLock}'>
 						<%-- If the record can be edited, display these links. --%>
-							<i class="fa fa-pencil pull-right roffset10" title="<fmt:message key="label.common.edit" />"
+							<i class="fa fa-pencil float-end roffset10" title="<fmt:message key="label.common.edit" />"
 										onclick="javascript:editRecord('${sessionMapID}',${recordStatus.index+1})"></i>
-							<i class="fa fa-times  pull-right roffset10" title="<fmt:message key="label.common.delete" />"
+							<i class="fa fa-times  float-end roffset10" title="<fmt:message key="label.common.delete" />"
 										onclick="javascript:removeRecord('${sessionMapID}',${recordStatus.index+1})"></i>
 						</c:if>
 					</div>
Index: lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp
===================================================================
diff -u -r2de8f805211b6433aff4efd6fa9275a1b9933033 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp	(.../listRecordsHorizontalPart.jsp)	(revision 2de8f805211b6433aff4efd6fa9275a1b9933033)
+++ lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp	(.../listRecordsHorizontalPart.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -56,7 +56,7 @@
 						${recordStatus.index+1}
 					</span>
 					<c:if test='${includeMode=="learning" and not finishedLock}'>
-						<span class="pull-right roffset10">
+						<span class="float-end roffset10">
 						<%-- If the record can be edited, display these links. --%>
 						<i class="fa fa-pencil" title="<fmt:message key="label.common.edit" />"
 									onclick="javascript:editRecord('${sessionMapID}',${recordStatus.index+1})"></i>
Index: lams_tool_daco/web/pages/learning/notebook.jsp
===================================================================
diff -u -rd5fa41792bdb2657d0d53c35126a64604510d18a -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_daco/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision d5fa41792bdb2657d0d53c35126a64604510d18a)
+++ lams_tool_daco/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -39,8 +39,8 @@
 
 			<form:textarea id="focused" rows="5" path="entryText" cssClass="form-control"></form:textarea>
 
-			<div class="space-bottom-top align-right">
-				<button type="submit" class="btn btn-primary voffset5 pull-right na" id="finishButton">
+			<div class="activity-bottom-buttons">
+				<button type="submit" class="btn btn-primary na" id="finishButton">
 					<span class="nextActivity">
 						<c:choose>
 		 					<c:when test="${sessionMap.isLastActivity}">
Index: lams_tool_doku/web/pages/learning/galleryWalk.jsp
===================================================================
diff -u -r66aaa15469871d9f71cafcfc4222ffa90f2d9bb2 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_doku/web/pages/learning/galleryWalk.jsp	(.../galleryWalk.jsp)	(revision 66aaa15469871d9f71cafcfc4222ffa90f2d9bb2)
+++ lams_tool_doku/web/pages/learning/galleryWalk.jsp	(.../galleryWalk.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -132,13 +132,9 @@
 	<h4 class="voffset20" style="text-align: center"><fmt:message key="label.gallery.walk" /></h4>
 	
 	<c:if test="${mode == 'author'}">
-		<div class="row no-gutter" id="gallery-walk-preview-info">
-			<div class="col-xs-12 col-sm-offset-2 col-sm-8">
-				<div class="alert alert-info leader-display">
-					<fmt:message key="label.gallery.walk.preview" />
-				</div>
-			</div>
-		</div>
+		<lams:Alert5 type="info" id="gallery-walk-preview-info" close="false">
+			<fmt:message key="label.gallery.walk.preview" />
+		</lams:Alert5>
 	</c:if>
 	
 
@@ -183,7 +179,7 @@
 			<c:choose>
 				<c:when test="${not dokumaran.galleryWalkFinished}">
 					<button data-toggle="tooltip" 
-							class="btn btn-default voffset5 pull-right ${mode == 'author' ? '' : 'disabled'}"
+							class="btn btn-default voffset5 float-end ${mode == 'author' ? '' : 'disabled'}"
 							<c:choose>
 								<c:when test="${mode == 'author'}">
 									title="<fmt:message key='label.gallery.walk.wait.finish.preview' />"
@@ -199,12 +195,12 @@
 				</c:when>
 				<c:when test="${sessionMap.reflectOn and not sessionMap.userFinished}">
 					<button name="FinishButton" id="finish-button"
-							onclick="return continueReflect()" class="btn btn-default voffset5 pull-right">
+							onclick="return continueReflect()" class="btn btn-default voffset5 float-end">
 						<fmt:message key="label.continue" />
 					</button>
 				</c:when>
 				<c:otherwise>
-					<a href="#nogo" name="FinishButton" id="finish-button" class="btn btn-primary voffset5 pull-right na">
+					<a href="#nogo" name="FinishButton" id="finish-button" class="btn btn-primary voffset5 float-end na">
 						<span class="nextActivity">
 							<c:choose>
 			 					<c:when test="${sessionMap.isLastActivity}">
Index: lams_tool_doku/web/pages/learning/learning.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_doku/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_doku/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -279,7 +279,7 @@
 					</c:choose>
 
 					<c:if test="${mode != 'teacher'}">
-						<button name="ContinueButton" onclick="return continueReflect()" class="btn btn-sm btn-default voffset5">
+						<button name="ContinueButton" onclick="return continueReflect()" class="btn btn-sm btn-secondary voffset5">
 						<fmt:message key="label.edit" />
 						</button>
 					</c:if>
@@ -289,11 +289,11 @@
 		<!-- End Reflection -->
 
 		<c:if test="${mode != 'teacher'}">
-			<div>
+			<div class="activity-bottom-buttons">
 				<c:choose>
 					<c:when test="${dokumaran.galleryWalkEnabled}">
 						<button data-toggle="tooltip" id="continue-button"
-								class="btn btn-default voffset5 pull-right ${mode == 'author' ? '' : 'disabled'}"
+								class="btn btn-primary ${mode == 'author' ? '' : 'disabled'}"
 								<c:choose>
 									<c:when test="${mode == 'author'}">
 										title="<fmt:message key='label.gallery.walk.wait.start.preview' />"
@@ -309,7 +309,7 @@
 					</c:when>
 					<c:when test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
 						<button name="FinishButton" id="continue-button"
-								onclick="return continueReflect()" class="btn btn-default voffset5 pull-right">
+								onclick="return continueReflect()" class="btn btn-primary">
 							<fmt:message key="label.continue" />
 						</button>
 					</c:when>
@@ -318,7 +318,7 @@
 					</c:when>
 					<c:otherwise>
 						<a href="#nogo" name="FinishButton" id="finish-button"
-								class="btn btn-primary voffset5 pull-right na">
+								class="btn btn-primary na">
 							<span class="nextActivity">
 								<c:choose>
 				 					<c:when test="${sessionMap.isLastActivity}">
Index: lams_tool_doku/web/pages/learning/notebook.jsp
===================================================================
diff -u -rd5fa41792bdb2657d0d53c35126a64604510d18a -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_doku/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision d5fa41792bdb2657d0d53c35126a64604510d18a)
+++ lams_tool_doku/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -43,8 +43,8 @@
 			<form:textarea cols="60" rows="8" path="entryText"
 				cssClass="text-area form-control" />
 
-			<div class="space-bottom-top align-right">
-				<a href="#nogo" class="btn btn-primary voffset5 pull-right na" id="finishButton">
+			<div class="activity-bottom-buttons">
+				<a href="#nogo" class="btn btn-primary na" id="finishButton">
 					<span class="nextActivity">
 						<c:choose>
 		 					<c:when test="${sessionMap.isLastActivity}">
Index: lams_tool_doku/web/pages/learning/submissionDeadline.jsp
===================================================================
diff -u -r1621b6daf8385b83e75f7ffde03c017b05c12487 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_doku/web/pages/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 1621b6daf8385b83e75f7ffde03c017b05c12487)
+++ lams_tool_doku/web/pages/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -55,7 +55,7 @@
 			</div>
 		</c:if>
 
-		<div class="voffset10 pull-right">
+		<div class="voffset10 float-end">
 			<c:choose>
 				<c:when test="${sessionMap.reflectOn && (not sessionMap.userFinished) && empty sessionMap.submissionDeadline}">
 					<button name="FinishButton" onclick="return continueReflect()" class="button">
Index: lams_tool_doku/web/pages/learning/waitForTimeLimitLaunch.jsp
===================================================================
diff -u -re9f9ac4d0bb609a9c1bb7d966e4162456b5f4b40 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_doku/web/pages/learning/waitForTimeLimitLaunch.jsp	(.../waitForTimeLimitLaunch.jsp)	(revision e9f9ac4d0bb609a9c1bb7d966e4162456b5f4b40)
+++ lams_tool_doku/web/pages/learning/waitForTimeLimitLaunch.jsp	(.../waitForTimeLimitLaunch.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -19,8 +19,8 @@
 			<fmt:message key="label.waiting.for.teacher.launch.activity" />
 		</lams:Alert>
 
-		<div class="voffset10">
-			<button name="refreshButton" onclick="javascript:location.reload();" class="btn btn-sm btn-default pull-right">
+		<div class="activity-bottom-buttons">
+			<button name="refreshButton" onclick="javascript:location.reload();" class="btn btn-primary">
 				<fmt:message key="label.refresh" />
 			</button>
 		</div>
Index: lams_tool_forum/web/jsps/learning/message/msgview.jsp
===================================================================
diff -u -r2de8f805211b6433aff4efd6fa9275a1b9933033 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_forum/web/jsps/learning/message/msgview.jsp	(.../msgview.jsp)	(revision 2de8f805211b6433aff4efd6fa9275a1b9933033)
+++ lams_tool_forum/web/jsps/learning/message/msgview.jsp	(.../msgview.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -43,7 +43,7 @@
  	        </c:choose>
 
 			<c:if test='${(sessionMap.mode == "teacher") or not (anonymous or hidden)}'>
-			<div class="pull-right">
+			<div class="float-end">
 			    <lams:Portrait userId="${msgDto.authorUserId}"/>
 			</div>
 			</c:if>
Index: lams_tool_forum/web/jsps/learning/message/topicform.jsp
===================================================================
diff -u -re9d4a85d791909ce45b65fce7d83830f07d472a5 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_forum/web/jsps/learning/message/topicform.jsp	(.../topicform.jsp)	(revision e9d4a85d791909ce45b65fce7d83830f07d472a5)
+++ lams_tool_forum/web/jsps/learning/message/topicform.jsp	(.../topicform.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -27,9 +27,9 @@
 <c:set var="backToForum">
 	<lams:WebAppURL />learning/viewForum.do?toolSessionID=${sessionMap.toolSessionID}&hideReflection=${sessionMap.hideReflection}
 </c:set>
-<input type="submit" value="<fmt:message key="button.submit" />" class="btn btn-primary voffset5 pull-right" id="submitButton"/>
+<input type="submit" value="<fmt:message key="button.submit" />" class="btn btn-primary voffset5 float-end" id="submitButton"/>
 
-<button name="goback" onclick="javascript:location.href='${backToForum}';" class="btn btn-default voffset5 pull-right" id="cancelButton">
+<button name="goback" onclick="javascript:location.href='${backToForum}';" class="btn btn-default voffset5 float-end" id="cancelButton">
 	<fmt:message key="button.cancel" />
 </button>&nbsp;
 
Index: lams_tool_forum/web/jsps/learning/message/topiclist.jsp
===================================================================
diff -u -r9a66ee651d79f26996ac722785f9701a67b3eb6a -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_forum/web/jsps/learning/message/topiclist.jsp	(.../topiclist.jsp)	(revision 9a66ee651d79f26996ac722785f9701a67b3eb6a)
+++ lams_tool_forum/web/jsps/learning/message/topiclist.jsp	(.../topiclist.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -10,7 +10,7 @@
 	<div class="panel-heading panel-title">
 		<fmt:message key="label.topics" />
 
-		<div class="btn-group pull-right">
+		<div class="btn-group float-end">
 			<a href="javascript:location.href='${refresh}';" type="button" class="btn btn-xs btn-default"><i class="fa fa-xm fa-refresh"></i>
 				<fmt:message key="label.refresh" /></a>
 
@@ -29,8 +29,8 @@
 					<tr>
 						<th class="col-xs-6"><fmt:message key="lable.topic.title.subject" /></th>
 						<th class="col-xs-2"><fmt:message key="lable.topic.title.startedby" /></th>
-						<th class="col-xs-1 hidden-xs" class="hidden-xs"><fmt:message key="lable.topic.title.replies" /></th>
-						<th class="col-xs-1 hidden-xs"><fmt:message key="lable.topic.title.repliesnew" /></th>
+						<th class="col-xs-1 d-none d-sm-block"><fmt:message key="lable.topic.title.replies" /></th>
+						<th class="col-xs-1 d-none d-sm-block"><fmt:message key="lable.topic.title.repliesnew" /></th>
 						<th class="col-xs-2"><fmt:message key="lable.topic.title.update" /></th>
 						<c:if test="${not sessionMap.allowNewTopics and sessionMap.minimumReply ne 0}">
 							<th class="col-xs-2">&nbsp;</th>
@@ -89,9 +89,9 @@
 							<c:out value="${author}" escapeXml="true" />
 							</td>
 
-							<td class="text-center hidden-xs"><c:out value="${topic.message.replyNumber}" /></td>
+							<td class="text-center d-none d-sm-block"><c:out value="${topic.message.replyNumber}" /></td>
 
-							<td class="text-center hidden-xs"><c:out value="${topic.newPostingsNum}" /></td>
+							<td class="text-center d-none d-sm-block"><c:out value="${topic.newPostingsNum}" /></td>
 							
 							<c:set var="displayDate" value="${topic.message.updated > topic.message.lastReplyDate ? topic.message.updated : topic.message.lastReplyDate}"/>
 							<td><lams:Date value="${displayDate}" timeago="true"/></td>
Index: lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp
===================================================================
diff -u -r6132d98ee813109713fda3579007d4359596fc1e -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	(.../topicreplyform.jsp)	(revision 6132d98ee813109713fda3579007d4359596fc1e)
+++ lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	(.../topicreplyform.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -26,7 +26,7 @@
 	<lams:WaitingSpinner id="itemAttachmentArea_Busy"/>
 </c:if>
 
-<div class="btn-group-xs voffset5 pull-right">
+<div class="btn-group-xs voffset5 float-end">
 	<button name="goback" id="cancelButton" onclick="javascript:cancelReply();"
 		class="btn btn-default roffset5">
 		<fmt:message key="button.cancel" />
Index: lams_tool_forum/web/jsps/learning/notebook.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_forum/web/jsps/learning/notebook.jsp	(.../notebook.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_forum/web/jsps/learning/notebook.jsp	(.../notebook.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -73,8 +73,8 @@
 		
 				<textarea id="focused" rows="5" name="entryText" class="form-control">${reflectionForm.entryText}</textarea>
 		
-				<div class="space-bottom-top align-right">
-					<a  href="#nogo" class="btn btn-primary voffset5 pull-right na" id="finishButton">
+				<div class="activity-bottom-buttons">
+					<a  href="#nogo" class="btn btn-primary na" id="finishButton">
 						<span class="nextActivity">
 							<c:choose>
 			 					<c:when test="${sessionMap.isLastActivity}">
Index: lams_tool_forum/web/jsps/learning/submissionDeadline.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_forum/web/jsps/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_forum/web/jsps/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -57,7 +57,7 @@
 				</fmt:message>
 			</lams:Alert>
 		
-			<div class="space-bottom-top align-right">
+			<div class="activity-bottom-buttons">
 				<c:set var="continue">
 					<lams:WebAppURL />learning/newReflection.do?sessionMapID=${sessionMapID}
 				</c:set>
@@ -77,13 +77,13 @@
 						test="${sessionMap.reflectOn && (not sessionMap.finishedLock)}">
 						<button name="continue"
 							onclick="javascript:location.href='${continue}';"
-							class="btn btn-primary voffset5 pull-right">
+							class="btn btn-primary">
 							<fmt:message key="label.continue" />
 						</button>
 					</c:when>
 					<c:otherwise>
 						<a href="#nogo"  name="finish" id="finish"
-							onclick="submitFinish();" class="btn btn-primary voffset5 pull-right na">
+							onclick="submitFinish();" class="btn btn-primary na">
 								<c:choose>
 				 					<c:when test="${sessionMap.isLastActivity}">
 				 						<fmt:message key="label.submit" />
Index: lams_tool_forum/web/jsps/learning/viewforum.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -184,7 +184,7 @@
 						<c:if test='${sessionMap.mode != "teacher"}'>
 							<button name="continue"
 								onclick="javascript:location.href='${continue}';"
-								class="btn btn-default pull-left" id="editReflection">
+								class="btn btn-default float-start" id="editReflection">
 								<fmt:message key="label.edit" />
 							</button>
 						</c:if>
@@ -198,13 +198,13 @@
 					<c:when	test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
 						<button name="continue"
 							onclick="javascript:location.href='${continue}';"
-							class="btn btn-primary voffset5 pull-right">
+							class="btn btn-primary voffset5 float-end">
 							<fmt:message key="label.continue" />
 						</button>
 					</c:when>
 		
 					<c:otherwise>
-						<a href="#nogo" name="finish" id="finishButton" class="btn btn-primary voffset5 pull-right na">
+						<a href="#nogo" name="finish" id="finishButton" class="btn btn-primary voffset5 float-end na">
 							<span class="nextActivity">
 								<c:choose>
 				 					<c:when test="${sessionMap.isLastActivity}">
Index: lams_tool_forum/web/jsps/learning/viewtopic.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_forum/web/jsps/learning/viewtopic.jsp	(.../viewtopic.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_forum/web/jsps/learning/viewtopic.jsp	(.../viewtopic.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -132,14 +132,14 @@
 				<!--  Button Panel -->
 				<div class="row no-gutter">
 					<div class="col-xs-12">
-						<a href="javascript:refreshTopic();" class="btn btn-sm btn-default voffset5  pull-left" role="button"> <fmt:message
+						<a href="javascript:refreshTopic();" class="btn btn-sm btn-secondary voffset5  float-start" role="button"> <fmt:message
 								key="label.refresh" />
 						</a>
 						<c:set var="backToForum">
 							<lams:WebAppURL />learning/viewForum.do?mode=${sessionMap.mode}&sessionMapID=${sessionMapID}&toolSessionID=${sessionMap.toolSessionID}&hideReflection=${sessionMap.hideReflection}
 						</c:set>
 						<button name="backToForum" onclick="javascript:location.href='${backToForum}';"
-							class="btn btn-sm btn-primary voffset5 pull-right">
+							class="btn btn-sm btn-primary voffset5 float-end">
 							<fmt:message key="label.back.to.forum" />
 						</button>
 					</div>
Index: lams_tool_images/web/pages/learning/learning.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -258,7 +258,7 @@
 					</div>
 
 					<c:if test="${mode != 'teacher'}">
-						<button name="FinishButton" onclick="return continueReflect()" class="btn btn-default pull-left">
+						<button name="FinishButton" onclick="return continueReflect()" class="btn btn-default float-start">
 							<fmt:message key="label.edit" />
 						</button>
 					</c:if>
@@ -274,12 +274,12 @@
 			>
 				<c:choose>
 					<c:when	test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
-						<button name="FinishButton" onclick="return continueReflect()" class="btn btn-primary pull-right" >
+						<button name="FinishButton" onclick="return continueReflect()" class="btn btn-primary float-end" >
 							<fmt:message key="label.continue" />
 						</button>
 					</c:when>
 					<c:otherwise>
-						<a href="#nogo" name="FinishButton" id="finishButton" class="btn btn-primary pull-right" >
+						<a href="#nogo" name="FinishButton" id="finishButton" class="btn btn-primary float-end" >
 							<span class="na">
 								<c:choose>
 				 					<c:when test="${sessionMap.isLastActivity}">
Index: lams_tool_images/web/pages/learning/notebook.jsp
===================================================================
diff -u -rd5fa41792bdb2657d0d53c35126a64604510d18a -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_images/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision d5fa41792bdb2657d0d53c35126a64604510d18a)
+++ lams_tool_images/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -37,7 +37,7 @@
 
 			<textarea id="focused" rows="5" name="entryText" class="form-control"></textarea>
 
-			<a href="#nogo" class="btn btn-primary voffset5 pull-right" id="finishButton"">
+			<a href="#nogo" class="btn btn-primary voffset5 float-end" id="finishButton"">
 				<div class="na"> 
 					<c:choose>
 						<c:when test="${sessionMap.isLastActivity}">
Index: lams_tool_images/web/pages/learning/parts/commentsarea.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_images/web/pages/learning/parts/commentsarea.jsp	(.../commentsarea.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_images/web/pages/learning/parts/commentsarea.jsp	(.../commentsarea.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -101,19 +101,19 @@
 				
 			<div id="manage-image-buttons" class="btn-group" role="group">	
 				<c:if test="${imageGallery.allowShareImages}">
-					<button onclick="return checkNew()" class="btn btn-sm btn-default" id="check-for-new-button"> 
+					<button onclick="return checkNew()" class="btn btn-sm btn-secondary" id="check-for-new-button"> 
 						<i class="fa fa-refresh"></i> <fmt:message key="label.check.for.new" /> 
 					</button>
 								
 					<c:if test="${not finishedLock}">
 						<button onclick="javascript:newImageInit('<lams:WebAppURL />authoring/newImageInit.do?sessionMapID=${sessionMapID}&saveUsingLearningAction=true');"
-								class="btn btn-default btn-sm" id="add-new-image-button">  
+								class="btn btn-secondary btn-sm" id="add-new-image-button">  
 							<i class="fa fa-upload"></i> <fmt:message key="label.learning.add.new.image" />
 						</button>
 					</c:if>
 					
 					<c:if test="${sessionMap.isAuthor}">
-						<button href="#nogo" onclick="return deleteImage(${sessionMap.currentImage.uid});" class="btn btn-default btn-sm" id="delete-button"> 
+						<button href="#nogo" onclick="return deleteImage(${sessionMap.currentImage.uid});" class="btn btn-secondary btn-sm" id="delete-button"> 
 							<i class="fa fa-trash"></i> <fmt:message key="label.learning.delete.image" /> 
 						</button>
 					</c:if>
Index: lams_tool_imscc/web/pages/learning/learning.jsp
===================================================================
diff -u -rd5fa41792bdb2657d0d53c35126a64604510d18a -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_imscc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision d5fa41792bdb2657d0d53c35126a64604510d18a)
+++ lams_tool_imscc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -120,7 +120,7 @@
 		<%--Finish buttons--------------------------------------------------%>
 
 		<c:if test="${mode != 'teacher'}">
-			<div class="voffset10 pull-right">
+			<div class="voffset10 float-end">
 				<c:choose>
 					<c:when test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
 						<button name="FinishButton" onclick="return continueReflect()" class="btn btn-primary">
Index: lams_tool_imscc/web/pages/learning/notebook.jsp
===================================================================
diff -u -rd5fa41792bdb2657d0d53c35126a64604510d18a -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_imscc/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision d5fa41792bdb2657d0d53c35126a64604510d18a)
+++ lams_tool_imscc/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -43,7 +43,7 @@
 
 			<form:textarea id="focused" rows="5" path="entryText" cssClass="form-control" />
 
-			<div class="voffset10 pull-right">
+			<div class="voffset10 float-end">
 				<a href="#nogo" class="btn btn-primary " id="finishButton">
 					<span class="na">
 						<c:choose>
Index: lams_tool_lamc/web/learning/CombinedAnswersContent.jsp
===================================================================
diff -u -r221e0032a8c7b817a48534b0ba0569d128818749 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_lamc/web/learning/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision 221e0032a8c7b817a48534b0ba0569d128818749)
+++ lams_tool_lamc/web/learning/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -90,9 +90,11 @@
 <form:hidden path="continueOptionsCombined" value="Continue" />
 
 <c:if test="${hasEditRight}">
-  <button name="continueButton" class="btn btn-sm btn-primary pull-right" onclick="doSubmit();" type="button" id="continueButton">
-    <fmt:message key="button.continue" />
-  </button>
+	<div class="activity-bottom-buttons">
+	  <button name="continueButton" class="btn btn-primary" onclick="doSubmit();" type="button" id="continueButton">
+	    <fmt:message key="button.continue" />
+	  </button>
+  </div>
 </c:if>
 
 <!--options content ends here-->
Index: lams_tool_lamc/web/learning/Notebook.jsp
===================================================================
diff -u -rd5fa41792bdb2657d0d53c35126a64604510d18a -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_lamc/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision d5fa41792bdb2657d0d53c35126a64604510d18a)
+++ lams_tool_lamc/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -36,7 +36,7 @@
 				</textarea>
 
 
-				<a href="#" name="submitReflection" id="finishButton" class="btn btn-primary pull-right voffset10 na">
+				<a href="#" name="submitReflection" id="finishButton" class="btn btn-primary float-end voffset10 na">
 					<fmt:message key="button.endLearning" />
 				</a>
 
Index: lams_tool_lamc/web/learning/SimpleLearnerError.jsp
===================================================================
diff -u -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_lamc/web/learning/SimpleLearnerError.jsp	(.../SimpleLearnerError.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
+++ lams_tool_lamc/web/learning/SimpleLearnerError.jsp	(.../SimpleLearnerError.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -13,7 +13,7 @@
 
 <body class="stripes">
 	<lams:Page type="learner" title="${title}">
-		<div class="voffset10 pull-right">
+		<div class="voffset10 float-end">
 			<lams:errors/>
 		</div>
 		<div id="footer"></div>
Index: lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp
===================================================================
diff -u -r221e0032a8c7b817a48534b0ba0569d128818749 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp	(.../SingleQuestionAnswersContent.jsp)	(revision 221e0032a8c7b817a48534b0ba0569d128818749)
+++ lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp	(.../SingleQuestionAnswersContent.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -91,24 +91,26 @@
 	</c:if>
 </c:forEach>
 
-<c:if test="${mcGeneralLearnerFlowDTO.totalCountReached != 'true'  &&  mcGeneralLearnerFlowDTO.totalQuestionCount != '1'}">
-	<button name="continueOptionsCombined" type="button" onclick="submitNextQuestionSelected();"
-			class="btn btn-sm btn-primary pull-right">
-		<fmt:message key="button.continue" />
-	</button>
-</c:if>
+<div class="activity-bottom-buttons">
+	<c:if test="${mcGeneralLearnerFlowDTO.totalCountReached != 'true'  &&  mcGeneralLearnerFlowDTO.totalQuestionCount != '1'}">
+		<button name="continueOptionsCombined" type="button" onclick="submitNextQuestionSelected();"
+				class="btn btn-primary">
+			<fmt:message key="button.continue" />
+		</button>
+	</c:if>
+	
+	<c:if test="${mcGeneralLearnerFlowDTO.totalQuestionCount == '1'}">
+		<button name="continueOptionsCombined" type="button" onclick="doSubmit();" class="btn btn-primary">
+			<fmt:message key="button.continue" />
+		</button>
+	</c:if>
+	
+	<c:if test="${mcGeneralLearnerFlowDTO.totalCountReached == 'true'}">
+		<button name="continueOptionsCombined" type="button" onclick="submitAllAnswers();"
+				class="btn btn-primary">
+			<fmt:message key="button.submit" />
+		</button>
+	</c:if>
+</div>
 
-<c:if test="${mcGeneralLearnerFlowDTO.totalQuestionCount == '1'}">
-	<button name="continueOptionsCombined" type="button" onclick="doSubmit();" class="btn btn-sm btn-primary pull-right">
-		<fmt:message key="button.continue" />
-	</button>
-</c:if>
-
-<c:if test="${mcGeneralLearnerFlowDTO.totalCountReached == 'true'}">
-	<button name="continueOptionsCombined" type="button" onclick="submitAllAnswers();"
-			class="btn btn-sm btn-primary pull-right">
-		<fmt:message key="button.submit" />
-	</button>
-</c:if>
-
 <!--options content ends here-->
Index: lams_tool_lamc/web/learning/ViewAnswers.jsp
===================================================================
diff -u -rd5fa41792bdb2657d0d53c35126a64604510d18a -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_lamc/web/learning/ViewAnswers.jsp	(.../ViewAnswers.jsp)	(revision d5fa41792bdb2657d0d53c35126a64604510d18a)
+++ lams_tool_lamc/web/learning/ViewAnswers.jsp	(.../ViewAnswers.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -316,7 +316,7 @@
 				<form:hidden path="passMarkApplicable" />
 
 				<c:if test="${(mcGeneralLearnerFlowDTO.retries == 'true') && hasEditRight}">
-					<input type="submit" name="redoQuestions" class="btn btn-primary pull-left" value="<fmt:message key="label.redo.questions" />"/>
+					<input type="submit" name="redoQuestions" class="btn btn-primary float-start" value="<fmt:message key="label.redo.questions" />"/>
 				</c:if>
 				
 				<c:if test="${(mcGeneralLearnerFlowDTO.retries != 'true') 
@@ -325,7 +325,7 @@
 						<c:if test="${(mcGeneralLearnerFlowDTO.reflection != 'true') || !hasEditRight}">
 							<form:hidden path="learnerFinished" value="Finished" />
 
-							<a href="#nogo" class="btn btn-primary pull-right na" id="finishButton">
+							<a href="#nogo" class="btn btn-primary float-end na" id="finishButton">
 								<c:choose>
 									<c:when test="${isLastActivity}">
 										<fmt:message key="label.submit" />
@@ -338,7 +338,7 @@
 						</c:if>
 
 						<c:if test="${(mcGeneralLearnerFlowDTO.reflection == 'true') && hasEditRight}">
-							<input type="submit" name="forwardtoReflection" class="btn btn-primary pull-right" value="<fmt:message key="label.continue" />"/>
+							<input type="submit" name="forwardtoReflection" class="btn btn-primary float-end" value="<fmt:message key="label.continue" />"/>
 						</c:if>
 					</div>
 				</c:if>
Index: lams_tool_lamc/web/learning/WaitForLeader.jsp
===================================================================
diff -u -rea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_lamc/web/learning/WaitForLeader.jsp	(.../WaitForLeader.jsp)	(revision ea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74)
+++ lams_tool_lamc/web/learning/WaitForLeader.jsp	(.../WaitForLeader.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -37,7 +37,7 @@
 			</c:forEach>
 		</div>
 
-		<button name="refreshButton" onclick="refresh();" class="btn btn-primary pull-right">
+		<button name="refreshButton" onclick="refresh();" class="btn btn-primary float-end">
 			<fmt:message key="label.refresh" />
 		</button>
 	</lams:Page>
Index: lams_tool_lamc/web/learning/submissionDeadline.jsp
===================================================================
diff -u -r3bb7e0141ae1cc15ccd737c95d90b5762a34ad61 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_lamc/web/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 3bb7e0141ae1cc15ccd737c95d90b5762a34ad61)
+++ lams_tool_lamc/web/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -48,7 +48,7 @@
 			<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}">
 				<form:hidden path="learnerFinished" value="Finished" />
 
-				<a href="#nogo" class="btn btn-primary pull-right voffset10 na" id="finishButton"
+				<a href="#nogo" class="btn btn-primary float-end voffset10 na" id="finishButton"
 					onclick="javascript:submitForm('finish');return false">
 					<c:choose>
 						<c:when test="${isLastActivity}">
Index: lams_tool_lamc/web/tblmonitoring/mcq.jsp
===================================================================
diff -u -rda1abc0b860ba2d8731b856007edd061fd87f0b1 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_lamc/web/tblmonitoring/mcq.jsp	(.../mcq.jsp)	(revision da1abc0b860ba2d8731b856007edd061fd87f0b1)
+++ lams_tool_lamc/web/tblmonitoring/mcq.jsp	(.../mcq.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -30,7 +30,7 @@
 	</div>
 	
 	<c:if test="${attemptedLearnersNumber != 0}">
-		<div class="col-xs-6 col-md-4 col-md-offset-4 col-lg-4 col-lg-offset-2">
+		<div class="col-xs-6 col-md-4 offset-md-4 col-lg-4 offset-lg-2">
 			<a href="#nogo" type="button" class="btn btn-sm btn-default buttons_column"
 					onclick="javascript:loadTab('mcqStudentChoices'); return false;">
 				<i class="fa fa-file"></i>
Index: lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp
===================================================================
diff -u -r89279cb44b252167269043889b3c3c0a4164e0bb -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp	(.../mcqStudentChoices.jsp)	(revision 89279cb44b252167269043889b3c3c0a4164e0bb)
+++ lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp	(.../mcqStudentChoices.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -26,7 +26,7 @@
 	<div class="col-md-6 col-lg-4 ">
 	</div>
 	
-	<div class="col-xs-12 col-md-6 col-lg-4 col-lg-offset-2">
+	<div class="col-xs-12 col-md-6 col-lg-4 offset-lg-2">
 		<a href="#nogo" type="button" class="btn btn-sm btn-default buttons_column"
 				onclick="javascript:loadTab('iraMcq'); return false;">
 			<i class="fa fa-undo"></i>
Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -ra69390a3d4a6fdfe442a3a6e8b6e3c306b49b612 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision a69390a3d4a6fdfe442a3a6e8b6e3c306b49b612)
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -100,32 +100,28 @@
 
 				<c:if test="${!generalLearnerFlowDTO.showOtherAnswers}">
 					<c:if test="${generalLearnerFlowDTO.reflection != 'true'}">
-						<div class="space-bottom-top align-right">
-							<button type="button" id="finishButton" class="btn btn-primary pull-right na">
-								<c:choose>
-									<c:when test="${sessionMap.isLastActivity}">
-										<fmt:message key="button.submit" />
-									</c:when>
-									<c:otherwise>
-										<fmt:message key="button.endLearning" />
-									</c:otherwise>
-								</c:choose>
-
+						<button type="button" id="finishButton" class="btn btn-primary na">
+							<c:choose>
+								<c:when test="${sessionMap.isLastActivity}">
+									<fmt:message key="button.submit" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="button.endLearning" />
+								</c:otherwise>
+							</c:choose>
 							</button>
-						</div>
 					</c:if>
 
-
 					<c:if test="${generalLearnerFlowDTO.reflection == 'true'}">
 						<button name="forwardtoReflection" type="button" onclick="javascript:submitMethod('storeAllResults');"
-								class="btn btn-primary pull-right">
+								class="btn btn-primary">
 							<fmt:message key="label.continue" />
 						</button>
 					</c:if>
 				</c:if>
 
 				<c:if test="${!generalLearnerFlowDTO.noReeditAllowed}">
-					<button type="button" name="redoQuestions" class="btn btn-primary mx-2 float-start"
+					<button type="button" name="redoQuestions" class="btn btn-primary mx-2"
 							onclick="submitMethod('redoQuestions');">
 						<fmt:message key="label.redo" />
 					</button>
Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
diff -u -ra69390a3d4a6fdfe442a3a6e8b6e3c306b49b612 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision a69390a3d4a6fdfe442a3a6e8b6e3c306b49b612)
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -139,7 +139,7 @@
 							<div class="${splitRow}">
 								<div class="sbox">
 									<div class="sbox-heading bg-warning">
-										<div class="pull-left roffset5"><lams:Portrait userId="${userResponse.qaQueUser.queUsrId}"/></div>
+										<div class="float-start roffset5"><lams:Portrait userId="${userResponse.qaQueUser.queUsrId}"/></div>
 										<span><c:out value="${userResponse.qaQueUser.fullname}" /></span>
 										<br><span style="font-size: smaller"><lams:Date value="${userResponse.attemptTime}" timeago="true"/></span>
 									</div>
@@ -229,7 +229,7 @@
 					</div>
 
 					<c:if test="${hasEditRight && mode != 'teacher'}">
-						<button name="forwardtoReflection" type="button" class="btn btn-default pull-left"
+						<button name="forwardtoReflection" type="button" class="btn btn-default float-start"
 								onclick="submitMethod('forwardtoReflection');">
 							<fmt:message key="label.edit" />
 						</button>
@@ -241,16 +241,16 @@
 
 		<!-- buttons -->
 		<c:if test="${mode != 'teacher'}">
-			<div class="right-buttons voffset5" align="right" id="learner-submit">
+			<div class="activity-bottom-buttons" id="learner-submit">
 				<c:if test="${!generalLearnerFlowDTO.isLearnerFinished}">
-					<button type="button" class="btn btn-default voffset5 roffset5 pull-left"
+					<button type="button" class="btn btn-secondary roffset5 float-start"
 							onclick="refreshPage('${qaLearningForm.refreshAnswers}');">
 						<fmt:message key="label.refresh" />
 					</button>
 				</c:if>
 
 				<c:if test="${(generalLearnerFlowDTO.lockWhenFinished != 'true') && hasEditRight && !generalLearnerFlowDTO.noReeditAllowed}">
-					<button name="redoQuestions" type="button" class="btn btn-default voffset5  pull-left"
+					<button name="redoQuestions" type="button" class="btn btn-secondary float-start"
 							onclick="submitMethod('redoQuestions');">
 						<fmt:message key="label.redo" />
 					</button>
@@ -259,13 +259,13 @@
 				<c:choose>
 					<c:when test="${(generalLearnerFlowDTO.reflection == 'true') && hasEditRight && !generalLearnerFlowDTO.isLearnerFinished}">
 						<button type="button" name="forwardtoReflection" onclick="javascript:submitMethod('forwardtoReflection');"
-								class="btn btn-default">
+								class="btn btn-primary">
 							<fmt:message key="label.continue" />
 						</button>
 					</c:when>
 
 					<c:when test="${(generalLearnerFlowDTO.reflection != 'true') || !hasEditRight || generalLearnerFlowDTO.isLearnerFinished}">
-						<button type="button" id="finishButton" class="btn btn-primary float-end na">
+						<button type="button" id="finishButton" class="btn btn-primary na">
 							<c:choose>
 								<c:when test="${sessionMap.isLastActivity}">
 									<fmt:message key="button.submit" />
Index: lams_tool_laqa/web/learning/Notebook.jsp
===================================================================
diff -u -rd5fa41792bdb2657d0d53c35126a64604510d18a -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_laqa/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision d5fa41792bdb2657d0d53c35126a64604510d18a)
+++ lams_tool_laqa/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -35,20 +35,20 @@
 
 	<form:textarea id="focused" rows="5" path="entryText" cssClass="form-control"></form:textarea>
 
-	<button id="finishButton"  class="btn btn-primary voffset5 pull-right na">
-		<span class="nextActivity">
-			<c:choose>
-				<c:when test="${sessionMap.isLastActivity}">
-					<fmt:message key="button.submit" />
-				</c:when>
-				<c:otherwise>
-	 				<fmt:message key="button.endLearning" />
-				</c:otherwise>
-			</c:choose>
-		</span>
-	</button>
-		
-	<div id="footer"></div>
+	<div class="activity-bottom-buttons">
+		<button id="finishButton"  class="btn btn-primary na">
+			<span class="nextActivity">
+				<c:choose>
+					<c:when test="${sessionMap.isLastActivity}">
+						<fmt:message key="button.submit" />
+					</c:when>
+					<c:otherwise>
+		 				<fmt:message key="button.endLearning" />
+					</c:otherwise>
+				</c:choose>
+			</span>
+		</button>
+	</div>
 </lams:Page>
 </form:form>
 
Index: lams_tool_laqa/web/learning/SequentialAnswersContent.jsp
===================================================================
diff -u -r2f6e8f9ecfee5b8078479721374d0cbeee3d699d -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	(.../SequentialAnswersContent.jsp)	(revision 2f6e8f9ecfee5b8078479721374d0cbeee3d699d)
+++ lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	(.../SequentialAnswersContent.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -63,20 +63,20 @@
 	</c:if>
 </c:forEach>
 
-<div class="">
+<div class="activity-bottom-buttons">
 	<!--question content ends here-->
 	<c:choose>
 		<c:when test="${(generalLearnerFlowDTO.currentQuestionIndex == generalLearnerFlowDTO.totalQuestionCount) && 
 				  				  (generalLearnerFlowDTO.totalQuestionCount != 1) }">
 			<button id="btnGetPrevious" type="button" onclick="javascript:submitMethod('getPreviousQuestion');"
-				class="btn btn-sm btn-primary mt-2">
+				class="btn btn-primary float-start mt-2">
 				<i class="fa fa-arrow-left"></i>
 				<fmt:message key="button.getPreviousQuestion" />
 			</button>
 
 			<div class="activity-bottom-buttons">
 				<button id="btnDone" type="button" onclick="javascript:submitMethod('submitAnswersContent');"
-					class="btn btn-primary float-end mt-3">
+					class="btn btn-primary mt-3">
 					<fmt:message key="button.done" />
 				</button>
 			</div>
@@ -86,7 +86,7 @@
 				  				  (generalLearnerFlowDTO.totalQuestionCount == 1) }">
 			<div class="activity-bottom-buttons">
 				<button id="btnDone" type="button" onclick="javascript:submitMethod('submitAnswersContent');"
-					class="btn btn-primary float-end mt-3">
+					class="btn btn-primary mt-3">
 					<fmt:message key="button.done" />
 				</button>
 			</div>
@@ -95,20 +95,20 @@
 		<c:when test="${generalLearnerFlowDTO.currentQuestionIndex != generalLearnerFlowDTO.totalQuestionCount && 
 				 				  generalLearnerFlowDTO.currentQuestionIndex > 1}">
 			<button id="btnGetPrevious" type="button" onclick="javascript:submitMethod('getPreviousQuestion');"
-				class="btn btn-sm btn-primary mt-2">
+				class="btn btn-primary float-start mt-2">
 				<i class="fa fa-arrow-left"></i>&nbsp;
 				<fmt:message key="button.getPreviousQuestion" />
 			</button>
 			<button id="btnGetNext" type="button" onclick="javascript:submitMethod('getNextQuestion');"
-				class="btn btn-sm btn-primary mt-2 float-end">
+				class="btn btn-primary mt-2">
 				<fmt:message key="button.getNextQuestion" />
 				&nbsp; <i class="fa fa-arrow-right"></i>
 			</button>
 		</c:when>
 
 		<c:otherwise>
 			<button id="btnGetNext" type="button" onclick="javascript:submitMethod('getNextQuestion');"
-				class="btn btn-sm btn-primary mt-2 float-end">
+				class="btn btn-primary mt-2">
 				<fmt:message key="button.getNextQuestion" />
 				&nbsp; <i class="fa fa-arrow-right"></i>
 			</button>
Index: lams_tool_laqa/web/learning/submissionDeadline.jsp
===================================================================
diff -u -r86c25c80d92701a94c3161575c76c363891402ad -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_laqa/web/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 86c25c80d92701a94c3161575c76c363891402ad)
+++ lams_tool_laqa/web/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -39,19 +39,19 @@
 			<form:hidden path="totalQuestionCount" />
 
 
-			<lams:Alert type="danger" id="submission-deadline" close="false">
+			<lams:Alert5 type="danger" id="submission-deadline" close="false">
 				<fmt:message key="authoring.info.teacher.set.restriction">
 					<fmt:param>
 						<lams:Date value="${sessionMap.submissionDeadline}" />
 					</fmt:param>
 				</fmt:message>
 			</lams:Alert>
 
-			<div class="right-buttons">
+			<div class="activity-bottom-buttons">
 
 				<c:if test="${generalLearnerFlowDTO.reflection != 'true'}">
 					<a href="#nogo" name="endLearning" id="finishButton"
-						onclick="javascript:submitMethod('endLearning');return false" class="btn btn-primary pull-right">
+						onclick="javascript:submitMethod('endLearning');return false" class="btn btn-primary">
 						<span class="na"> <c:choose>
 								<c:when test="${sessionMap.isLastActivity}">
 									<fmt:message key="button.submit" />
@@ -66,15 +66,13 @@
 
 				<c:if test="${generalLearnerFlowDTO.reflection == 'true'}">
 					<button name="forwardtoReflection" type="button" onclick="javascript:submitMethod('forwardtoReflection');"
-						class="btn btn-primary pull-right">
+						class="btn btn-primary">
 						<fmt:message key="label.continue" />
 					</button>
 				</c:if>
 
 			</div>
 		</form:form>
-
-		<div id="footer"></div>
 	</lams:Page>
 </body>
 </lams:html>
Index: lams_tool_larsrc/web/pages/itemreview/itemContent.jsp
===================================================================
diff -u -rf007d7e87e33de37ad35d279b1da1d59c9f42055 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_larsrc/web/pages/itemreview/itemContent.jsp	(.../itemContent.jsp)	(revision f007d7e87e33de37ad35d279b1da1d59c9f42055)
+++ lams_tool_larsrc/web/pages/itemreview/itemContent.jsp	(.../itemContent.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -55,7 +55,7 @@
 		    jsonpCallback: 'iframelyCallback${itemUid}',
 		    contentType: "application/json; charset=utf-8",
 		    error: function (xhr, status, error) {
-			    $('.embedded-open-button', panel).removeClass('btn-default hidden btn-sm pull-right').addClass('btn-primary');
+			    $('.embedded-open-button', panel).removeClass('btn-default hidden btn-sm float-end').addClass('btn-primary');
 		        console.log("Result: " + status + " " + error + " " + xhr.status + " " + xhr.statusText)
 		    }
 		});
@@ -79,11 +79,11 @@
 			<a href="<c:url value='${resourceItemReviewUrl}' />&preferDownload=true" class="download-button hidden btn btn-primary">
 				<fmt:message key="label.download" />
 			</a>
-			<a href="${resourceItemReviewUrl}" target="_blank" class="embedded-open-button hidden btn btn-default btn-sm pull-right">
+			<a href="${resourceItemReviewUrl}" target="_blank" class="embedded-open-button hidden btn btn-default btn-sm float-end">
 				<i class="fa fa-external-link" aria-hidden="true"></i>
 				<fmt:message key="open.in.new.window" />
 			</a>
-			<a href="<c:url value='${resourceItemReviewUrl}'/>" target="_blank" class="iframe-open-button hidden btn btn-default btn-sm pull-right">
+			<a href="<c:url value='${resourceItemReviewUrl}'/>" target="_blank" class="iframe-open-button hidden btn btn-default btn-sm float-end">
 				<i class="fa fa-external-link" aria-hidden="true"></i>
 				<fmt:message key="open.in.new.window" />
 			</a>
Index: lams_tool_larsrc/web/pages/learning/addfile.jsp
===================================================================
diff -u -rca136be52df70bbdd506d2383d4d4bd2201a3b3f -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_larsrc/web/pages/learning/addfile.jsp	(.../addfile.jsp)	(revision ca136be52df70bbdd506d2383d4d4bd2201a3b3f)
+++ lams_tool_larsrc/web/pages/learning/addfile.jsp	(.../addfile.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -34,7 +34,7 @@
 		<div id="image-upload-area" class="voffset20"></div>
 		
 		<lams:WaitingSpinner id="itemAttachmentArea_Busy"/>	
-		<div id="buttons" class="pull-right voffset10">
+		<div id="buttons" class="float-end voffset10">
 	 		<button name="goback" onclick="javascript:cancel()" class="btn btn-sm btn-default" id="cancelButton">
 				<fmt:message key="button.cancel" />
 			</button>&nbsp;
Index: lams_tool_larsrc/web/pages/learning/addurl.jsp
===================================================================
diff -u -rf6b464cd3128a6d8a5a07430d2aeeca8919eb5b7 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_larsrc/web/pages/learning/addurl.jsp	(.../addurl.jsp)	(revision f6b464cd3128a6d8a5a07430d2aeeca8919eb5b7)
+++ lams_tool_larsrc/web/pages/learning/addurl.jsp	(.../addurl.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -43,7 +43,7 @@
 				<lams:CKEditor id="instructions" value="" contentFolderID="${learnerContentFolder}"></lams:CKEditor>
 			</div>
 
-			<div id="buttons" class="pull-right" >
+			<div id="buttons" class="float-end" >
 				<button name="goback" onclick="javascript:cancel()" class="btn btn-sm btn-default" id="cancelButton">
 					<fmt:message key="button.cancel" />
 				</button>&nbsp;
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -276,7 +276,7 @@
 
 		<!--  Warnings -->
 		<c:if test="${sessionMap.lockOnFinish and mode != 'teacher' and (resource.allowAddFiles or resource.allowAddUrls) }">
-			<lams:Alert type="danger" id="warn-lock" close="false">
+			<lams:Alert5 type="danger" id="warn-lock" close="false">
 				<c:choose>
 					<c:when test="${sessionMap.userFinished}">
 						<fmt:message key="message.activityLocked" />
@@ -285,11 +285,11 @@
 						<fmt:message key="message.warnLockOnFinish" />
 					</c:otherwise>
 				</c:choose>
-			</lams:Alert>
+			</lams:Alert5>
 		</c:if>
 
 		<c:if test="${resource.miniViewResourceNumber > 0}">
-			<lams:Alert type="info" id="warn-numResources" close="false">${resource.miniViewNumberStr}</lams:Alert>
+			<lams:Alert5 type="info" id="warn-numResources" close="false">${resource.miniViewNumberStr}</lams:Alert5>
 		</c:if>
 
 		<lams:errors/>
@@ -303,7 +303,7 @@
 				<fmt:message key="label.resoruce.to.review" />
 
 				<!--  Panel button bar controlling refresh and adding items -->
-				<div class="btn-group pull-right">
+				<div class="btn-group float-end">
 					<c:if test="${mode != 'teacher'}">
 						<a href="#" onclick="javascript:return checkNew()" type="button" class="btn btn-xs btn-default">
 							<i class="fa fa-xm fa-refresh"></i> <fmt:message key="label.check.for.new" /></a>
@@ -344,7 +344,7 @@
 								</c:if>
 							</a>
 						</span>
-						<div class="pull-right">
+						<div class="float-end">
 							<c:choose>
 								<c:when test="${item.complete}">
 									<i class="fa fa-check-circle icon-complete" style="font-size: 1.5em;color: green;" title='<fmt:message key="label.completed" />'></i>
@@ -415,16 +415,15 @@
 		<!-- End Reflection -->
 
 		<c:if test="${mode != 'teacher' && sessionMap.hasCompletedMinNumber}">
-			<c:choose>
-				<c:when
-						test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
-					<button name="FinishButton"
-							onclick="return continueReflect()" class="btn btn-default voffset5 pull-right btn-disable-on-submit">
-						<fmt:message key="label.continue" />
-					</button>
-				</c:when>
-				<c:otherwise>
-					<button type="submit" id="finishButton" class="btn btn-primary btn-disable-on-submit voffset5 pull-right na">
+			<div class="activity-bottom-buttons">
+				<c:choose>
+					<c:when test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
+						<button name="FinishButton" onclick="return continueReflect()" class="btn btn-default btn-disable-on-submit">
+							<fmt:message key="label.continue" />
+						</button>
+					</c:when>
+					<c:otherwise>
+						<button type="submit" id="finishButton" class="btn btn-primary btn-disable-on-submit na">
 							<span class="nextActivity">
 								<c:choose>
 									<c:when test="${sessionMap.isLastActivity}">
@@ -435,18 +434,12 @@
 									</c:otherwise>
 								</c:choose>
 							</span>
-					</button>
-				</c:otherwise>
-			</c:choose>
+						</button>
+					</c:otherwise>
+				</c:choose>
 			</div>
 		</c:if>
 
-		<!--closes content-->
-
-		<div id="footer">
-		</div>
-		<!--closes footer-->
-
 	</lams:Page>
 	</body>
 </lams:html>
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/learning/notebook.jsp
===================================================================
diff -u -rd5fa41792bdb2657d0d53c35126a64604510d18a -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_larsrc/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision d5fa41792bdb2657d0d53c35126a64604510d18a)
+++ lams_tool_larsrc/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -39,8 +39,8 @@
 
 			<form:textarea rows="8" path="entryText" id="focused" cssClass="form-control" />
 
-			<div class="space-bottom-top align-right">
-				<button type="submit" class="btn btn-primary voffset5 pull-right na" id="finishButton">
+			<div class="activity-bottom-buttons">
+				<button type="submit" class="btn btn-primary na" id="finishButton">
 					<span class="nextActivity">
 						<c:choose>
 		 					<c:when test="${sessionMap.isLastActivity}">
Index: lams_tool_leader/web/pages/learning/leaderselection.jsp
===================================================================
diff -u -r66180f7c8f9a1a769643f2ef5c517d4ae1d97e8a -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_leader/web/pages/learning/leaderselection.jsp	(.../leaderselection.jsp)	(revision 66180f7c8f9a1a769643f2ef5c517d4ae1d97e8a)
+++ lams_tool_leader/web/pages/learning/leaderselection.jsp	(.../leaderselection.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -148,7 +148,7 @@
 
 				<button type="button" onclick="location.reload();" class="btn btn-secondary me-2">
 					<i class="fa fa-refresh"></i> 
-					<span class="hidden-xs">
+					<span class="d-none d-sm-block">
 						<fmt:message key="label.refresh" />
 					</span>
 				</button>
Index: lams_tool_mindmap/web/common/mapjs.jsp
===================================================================
diff -u -r844ffaca6d7137f02508f94278df450891baa480 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_mindmap/web/common/mapjs.jsp	(.../mapjs.jsp)	(revision 844ffaca6d7137f02508f94278df450891baa480)
+++ lams_tool_mindmap/web/common/mapjs.jsp	(.../mapjs.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -462,11 +462,11 @@
 			</div>
 			
 			<div style="display:inline-block" role="group">
-		 	<a href="#" class="toggleCollapse btn btn-default btn-sm" title="<fmt:message key='label.expand.collapse.idea'/>"><i class="fa fa-lg fa-navicon"></i><span class="hidden-xs">&nbsp;<fmt:message key='label.expand.collapse.idea'/></span></a>
+		 	<a href="#" class="toggleCollapse btn btn-default btn-sm" title="<fmt:message key='label.expand.collapse.idea'/>"><i class="fa fa-lg fa-navicon"></i><span class="d-none d-sm-block">&nbsp;<fmt:message key='label.expand.collapse.idea'/></span></a>
 		<c:if test="${contentEditable}">
-			<a href="#" class="addSubIdea btn btn-default btn-sm" title="<fmt:message key='label.add.idea'/>"><i class="fa fa-lg fa-plus-square-o"></i><span class="hidden-xs">&nbsp;<fmt:message key='label.add.idea'/></span></a>
-			<a href="#" class="editNode btn btn-default btn-sm" title="<fmt:message key='label.edit.idea.text'/>"><i class="fa fa-lg fa-pencil-square-o"></i><span class="hidden-xs">&nbsp;<fmt:message key='label.edit.idea.text'/></span></a>		
-			<a href="#" class="removeSubIdea btn btn-default btn-sm" title="<fmt:message key='label.delete.idea'/>"><i class="fa fa-lg fa-trash-o"></i><span class="hidden-xs">&nbsp;<fmt:message key='label.delete.idea'/></span></a>
+			<a href="#" class="addSubIdea btn btn-default btn-sm" title="<fmt:message key='label.add.idea'/>"><i class="fa fa-lg fa-plus-square-o"></i><span class="d-none d-sm-block">&nbsp;<fmt:message key='label.add.idea'/></span></a>
+			<a href="#" class="editNode btn btn-default btn-sm" title="<fmt:message key='label.edit.idea.text'/>"><i class="fa fa-lg fa-pencil-square-o"></i><span class="d-none d-sm-block">&nbsp;<fmt:message key='label.edit.idea.text'/></span></a>		
+			<a href="#" class="removeSubIdea btn btn-default btn-sm" title="<fmt:message key='label.delete.idea'/>"><i class="fa fa-lg fa-trash-o"></i><span class="d-none d-sm-block">&nbsp;<fmt:message key='label.delete.idea'/></span></a>
 	<%-- Not yet implemented in back end  --%> 
 	<%-- 		<input type="button" data-mm-action="export-image" value="Export To Image"/>  --%> 
 	<%--  		<input type="button" class="insertRoot" value="add root node">  --%> 
Index: lams_tool_mindmap/web/pages/learning/galleryWalk.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_mindmap/web/pages/learning/galleryWalk.jsp	(.../galleryWalk.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_mindmap/web/pages/learning/galleryWalk.jsp	(.../galleryWalk.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -139,13 +139,9 @@
 	<h4 class="voffset20" style="text-align: center"><fmt:message key="label.gallery.walk" /></h4>
 	
 	<c:if test="${mode == 'author'}">
-		<div class="row no-gutter" id="gallery-walk-preview-info">
-			<div class="col-xs-12 col-sm-offset-2 col-sm-8">
-				<div class="alert alert-info leader-display">
-					<fmt:message key="label.gallery.walk.preview" />
-				</div>
-			</div>
-		</div>
+		<lams:Alert5 type="info" id="gallery-walk-preview-info" close="false">
+			<fmt:message key="label.gallery.walk.preview" />
+		</lams:Alert5>
 	</c:if>
 	
 
@@ -185,11 +181,11 @@
 	</c:forEach>
 	
 	<c:if test="${mode != 'teacher'}">
-		<div>
+		<div class="activity-bottom-buttons">
 			<c:choose>
 				<c:when test="${not mindmapDTO.galleryWalkFinished}">
 					<button data-toggle="tooltip" 
-							class="btn btn-default voffset5 pull-right ${mode == 'author' ? '' : 'disabled'}"
+							class="btn btn-default ${mode == 'author' ? '' : 'disabled'}"
 							<c:choose>
 								<c:when test="${mode == 'author'}">
 									title="<fmt:message key='label.gallery.walk.wait.finish.preview' />"
@@ -205,12 +201,12 @@
 				</c:when>
 				<c:when test="${reflectOnActivity and not finishedActivity}">
 					<button name="FinishButton" id="finish-button"
-							onclick="return continueReflect()" class="btn btn-default voffset5 pull-right">
+							onclick="return continueReflect()" class="btn btn-default">
 						<fmt:message key="button.continue" />
 					</button>
 				</c:when>
 				<c:otherwise>
-					<a href="#nogo" name="FinishButton" id="finish-button" class="btn btn-primary voffset5 pull-right na">
+					<a href="#nogo" name="FinishButton" id="finish-button" class="btn btn-primary na">
 						<span class="nextActivity">
 							<c:choose>
 			 					<c:when test="${sessionMap.isLastActivity}">
Index: lams_tool_mindmap/web/pages/learning/mindmap.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_mindmap/web/pages/learning/mindmap.jsp	(.../mindmap.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_mindmap/web/pages/learning/mindmap.jsp	(.../mindmap.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -100,7 +100,7 @@
 				<%@ include file="/common/mapjs.jsp"%>
 		 		<%-- End MindMup -----------------------------------%>
 		 		
-				<div class="voffset10 pull-right">
+				<div class="activity-bottom-buttons">
 					<c:choose>
 						<c:when test="${isMonitor}">
 							<button class="btn btn-primary" name="backButton" onclick="history.go(-1)">
@@ -112,7 +112,7 @@
 							<c:choose>
 								<c:when test="${mindmapDTO.galleryWalkEnabled}">
 									<button data-toggle="tooltip" 
-											class="btn btn-default voffset5 pull-right ${mode == 'author' ? '' : 'disabled'}"
+											class="btn btn-default ${mode == 'author' ? '' : 'disabled'}"
 											<c:choose>
 												<c:when test="${mode == 'author'}">
 													title="<fmt:message key='label.gallery.walk.wait.start.preview' />"
Index: lams_tool_mindmap/web/pages/learning/reflect.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_mindmap/web/pages/learning/reflect.jsp	(.../reflect.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_mindmap/web/pages/learning/reflect.jsp	(.../reflect.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -56,18 +56,20 @@
 				</c:otherwise>
 			</c:choose>
 			
-			<button type="button" class="btn btn-primary voffset5 pull-right" id="finishButton">
-				<span class="na">
-					<c:choose>
-						<c:when test="${isLastActivity}">
-							<fmt:message key="button.submit" />
-						</c:when>
-						<c:otherwise>
-							<fmt:message key="button.finish" />
-						</c:otherwise>
-					</c:choose>
-				</span>
-			</button>
+			<div class="activity-bottom-buttons">
+				<button type="button" class="btn btn-primary" id="finishButton">
+					<span class="na">
+						<c:choose>
+							<c:when test="${isLastActivity}">
+								<fmt:message key="button.submit" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="button.finish" />
+							</c:otherwise>
+						</c:choose>
+					</span>
+				</button>
+			</div>
 	
 		</form:form>
 	</lams:Page>
Index: lams_tool_mindmap/web/pages/learning/submissionDeadline.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_mindmap/web/pages/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_mindmap/web/pages/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -40,7 +40,7 @@
 			<form:form action="finishActivity.do" method="post" onsubmit="disableFinishButton();" modelAttribute="learningForm" id="learningForm">
 				<form:hidden path="toolSessionID" />
 	
-				<div class="voffset10 pull-right">
+				<div class="activity-bottom-buttons">
 					<a href="#nogo" class="btn btn-primary na" id="finishButton" onclick="submitForm('finish')">
 						<span class="na">
 							<c:choose>
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/LearningController.java
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/LearningController.java	(.../LearningController.java)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/LearningController.java	(.../LearningController.java)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -136,7 +136,6 @@
 
 	if (isFlagSet(nbContent, NoticeboardConstants.FLAG_DEFINE_LATER)) {
 	    request.setAttribute(NoticeboardConstants.TOOL_SESSION_ID, toolSessionID);
-	    request.setAttribute(NoticeboardConstants.TITLE, nbContent.getTitle());
 	    return "defineLater";
 	}
 
Index: lams_tool_nb/web/message.jsp
===================================================================
diff -u -r3bb7e0141ae1cc15ccd737c95d90b5762a34ad61 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_nb/web/message.jsp	(.../message.jsp)	(revision 3bb7e0141ae1cc15ccd737c95d90b5762a34ad61)
+++ lams_tool_nb/web/message.jsp	(.../message.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -23,19 +23,19 @@
 	
 	<lams:errors/>
 	
-	<div class="align-right space-bottom-top">
+	<div class="activity-bottom-buttons">
 		<form:form modelAttribute="messageForm" action="/learner.do" target="_self" onsubmit="disableFinishButton();" id="messageForm">
 			<form:hidden path="toolSessionID" />
 			<form:hidden path="mode" />
 			<form:hidden path="method" value="finish"/>
 			<c:choose>
 				<c:when test="${reflectOnActivity}">
-					<button type="submit" name="method" class="btn">
+					<button type="submit" name="method" class="btn btn-primary">
 						<fmt:message key="button.continue" />
 					</button>
 				</c:when>
 				<c:otherwise>
-					<a href="#nogo" class="button" id="finishButton" onclick="submitForm('finish')">
+					<a href="#nogo" class="btn btn-primary" id="finishButton" onclick="submitForm('finish')">
 						<span class="nextActivity">
 							<c:choose>
 								<c:when test="${isLastActivity}">
Index: lams_tool_nb/web/reflect.jsp
===================================================================
diff -u -ref5bed2f62785ca5cdb668d9f1e8fbf4f0256dff -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_nb/web/reflect.jsp	(.../reflect.jsp)	(revision ef5bed2f62785ca5cdb668d9f1e8fbf4f0256dff)
+++ lams_tool_nb/web/reflect.jsp	(.../reflect.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -24,15 +24,19 @@
 		});
 	</script>
 
-	<lams:out value="${reflectInstructions}" escapeHtml="true" />
+	<div id="instructions" class="instructions">
+		<lams:out value="${reflectInstructions}" escapeHtml="true" />
+	</div>
+	<hr class="mx-5">
 
 	<form:form method="post" onsubmit="disableFinishButton();" modelAttribute="nbLearnerForm" id="nbLearnerForm">
+		<form:hidden path="toolSessionID" />
+		<form:hidden path="mode" />
+		<lams:errors5/>
+		
 		<textarea rows="4" name="reflectionText" value="${reflectEntry}" class="form-control mt-2"
 				  id="focusedInput"></textarea>
 
-		<form:hidden path="toolSessionID" />
-		<form:hidden path="mode" />
-
 		<div class="activity-bottom-buttons">
 			<button type="button" class="btn btn-primary" id="finishButton">
 				<c:choose>
Index: lams_tool_notebook/web/pages/learning/notebook.jsp
===================================================================
diff -u -rd5fa41792bdb2657d0d53c35126a64604510d18a -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_notebook/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision d5fa41792bdb2657d0d53c35126a64604510d18a)
+++ lams_tool_notebook/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -156,8 +156,8 @@
 			</c:if>
 
 			<c:if test="${mode != 'teacher'}">
-				<div class="right-buttons voffset5">
-					<button href="#nogo" class="btn btn-primary pull-right na" id="finishButton" type="button">
+				<div class="activity-bottom-buttons">
+					<button href="#nogo" class="btn btn-primary na" id="finishButton" type="button">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="button.submit" />
Index: lams_tool_notebook/web/pages/learning/submissionDeadline.jsp
===================================================================
diff -u -r3bb7e0141ae1cc15ccd737c95d90b5762a34ad61 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_notebook/web/pages/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 3bb7e0141ae1cc15ccd737c95d90b5762a34ad61)
+++ lams_tool_notebook/web/pages/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -32,17 +32,19 @@
 				<form:form action="learning/finishActivity.do" method="post" onsubmit="disableFinishButton();" modelAttribute="messageForm" id="messageForm">
 					<form:hidden path="toolSessionID" />
 		
-					<button href="#nogo" class="btn btn-primary pull-right voffset10 na" id="finishButton" type="button"
-						onclick="submitForm('finish')">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="button.submit" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="button.finish" />
-							</c:otherwise>
-						</c:choose>
-					</button>
+					<div class="activity-bottom-buttons">
+						<button href="#nogo" class="btn btn-primary na" id="finishButton" type="button"
+							onclick="submitForm('finish')">
+							<c:choose>
+								<c:when test="${isLastActivity}">
+									<fmt:message key="button.submit" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="button.finish" />
+								</c:otherwise>
+							</c:choose>
+						</button>
+					</div>
 				</form:form>
 			</c:if>
 		</lams:Page>
Index: lams_tool_notebook/web/pages/monitoring/print.jsp
===================================================================
diff -u -r91f4669270ac1638c8b9712624da11e0669ff6f1 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_notebook/web/pages/monitoring/print.jsp	(.../print.jsp)	(revision 91f4669270ac1638c8b9712624da11e0669ff6f1)
+++ lams_tool_notebook/web/pages/monitoring/print.jsp	(.../print.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -33,7 +33,7 @@
 
 	<body>
 		<button class="btn btn-primary pull-right" onClick="javascript:window.print()">
-			<i class="fa fa-print"></i> <span class="hidden-xs"><fmt:message key="monitor.summary.print"/></span>
+			<i class="fa fa-print"></i> <span class="d-none d-sm-block"><fmt:message key="monitor.summary.print"/></span>
 		</button>
 		
 		<div id="section-to-print">
Index: lams_tool_notebook/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r47dddf6db4afaba99d8f3f88fc50b16df9251a76 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_notebook/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 47dddf6db4afaba99d8f3f88fc50b16df9251a76)
+++ lams_tool_notebook/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -184,7 +184,7 @@
 <div class="panel">
 	<button class="btn btn-default pull-right"
 			onClick="javascript:window.open('${tool}monitoring/showPrintDialog.do?toolContentID=${param.toolContentID}', 'PrintNotebook',width=800,height=600,scrollbars)">
-		<i class="fa fa-print"></i> <span class="hidden-xs"><fmt:message key="monitor.summary.print"/></span>
+		<i class="fa fa-print"></i> <span class="d-none d-sm-block"><fmt:message key="monitor.summary.print"/></span>
 	</button>
 	
 	<h4>
Index: lams_tool_pixlr/web/pages/learning/notebook.jsp
===================================================================
diff -u -r3bb7e0141ae1cc15ccd737c95d90b5762a34ad61 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_pixlr/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 3bb7e0141ae1cc15ccd737c95d90b5762a34ad61)
+++ lams_tool_pixlr/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -44,18 +44,20 @@
 		
 				<form:textarea id="focused" rows="5" path="entryText" cssClass="form-control"/>
 		
-				<a href="#nogo" class="btn btn-primary voffset10 pull-right" id="finishButton" onclick="submitForm('finish')">
-					<span class="na">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="button.submit" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="button.finish" />
-							</c:otherwise>
-						</c:choose>
-					</span>
-				</a>
+				<div class="activity-bottom-buttons">
+					<a href="#nogo" class="btn btn-primary" id="finishButton" onclick="submitForm('finish')">
+						<span class="na">
+							<c:choose>
+								<c:when test="${isLastActivity}">
+									<fmt:message key="button.submit" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="button.finish" />
+								</c:otherwise>
+							</c:choose>
+						</span>
+					</a>
+				</div>
 			</form:form>
 		
 			<div class="footer"></div>
Index: lams_tool_pixlr/web/pages/learning/pixlr.jsp
===================================================================
diff -u -r3bb7e0141ae1cc15ccd737c95d90b5762a34ad61 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_pixlr/web/pages/learning/pixlr.jsp	(.../pixlr.jsp)	(revision 3bb7e0141ae1cc15ccd737c95d90b5762a34ad61)
+++ lams_tool_pixlr/web/pages/learning/pixlr.jsp	(.../pixlr.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -114,7 +114,7 @@
 									</c:otherwise>
 								</c:choose>
 											
-								<button	type="button" class="btn btn-default pull-left" >
+								<button	type="button" class="btn btn-default float-start" >
 									<fmt:message key="button.edit" />
 								</button>
 							</div>
@@ -129,7 +129,7 @@
 				<form:form action="learning/finishActivity.do" method="post" onsubmit="disableFinishButton();" id="learningForm" modelAttribute="learningForm">
 					<form:hidden path="toolSessionID" id="toolSessionID"/>
 					<form:hidden path="mode" value="${mode}" />	
-					<div class="voffset10 pull-right">
+					<div class="activity-bottom-buttons">
 						
 						<c:choose>
 							<c:when test="${pixlrDTO.allowViewOthersImages}">
Index: lams_tool_pixlr/web/pages/learning/success.jsp
===================================================================
diff -u -r46e01bf046d755f571ba59957ac869c086bad58c -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_pixlr/web/pages/learning/success.jsp	(.../success.jsp)	(revision 46e01bf046d755f571ba59957ac869c086bad58c)
+++ lams_tool_pixlr/web/pages/learning/success.jsp	(.../success.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -26,12 +26,12 @@
 	
 		<lams:Page type="learner" title="${title}" hideProgressBar="true">
 			
-			<button type="button" class="btn btn-primary pull-right" onclick="javascript:window.close();">
-				<fmt:message key="button.close" />
-			</button>
+			<div class="activity-bottom-buttons">
+				<button type="button" class="btn btn-primary" onclick="javascript:window.close();">
+					<fmt:message key="button.close" />
+				</button>
+			</div> 
 			
-			<div class="footer"></div>
-			
 		</lams:Page>
 	</body>
 </lams:html>
Index: lams_tool_pixlr/web/pages/learning/viewAll.jsp
===================================================================
diff -u -r3bb7e0141ae1cc15ccd737c95d90b5762a34ad61 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_pixlr/web/pages/learning/viewAll.jsp	(.../viewAll.jsp)	(revision 3bb7e0141ae1cc15ccd737c95d90b5762a34ad61)
+++ lams_tool_pixlr/web/pages/learning/viewAll.jsp	(.../viewAll.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -78,17 +78,17 @@
 				</c:choose>
 					
 				<%--Bottom buttons--------------------------------------------------%>
-				<button  class="btn btn-default btn-sm" onclick="javascript:document.getElementById('learningForm').action = '<lams:WebAppURL />learning/viewAllImages.do';">
+				<button  class="btn btn-secondary btn-sm" onclick="javascript:document.getElementById('learningForm').action = '<lams:WebAppURL />learning/viewAllImages.do';">
 					<fmt:message key="button.refresh" />
 				</button>
 					
 				<c:if test="${!pixlrDTO.lockOnFinish}">
-					<button  class="btn btn-default btn-sm loffset5" onclick="javascript:document.getElementById('learningForm').action = '<lams:WebAppURL />learning.do';">
+					<button  class="btn btn-secondary btn-sm loffset5" onclick="javascript:document.getElementById('learningForm').action = '<lams:WebAppURL />learning.do';">
 						<fmt:message key="button.redo" />
 					</button>
 				</c:if>
 									
-				<div class="voffset10 pull-right">
+				<div class="activity-bottom-buttons">
 					<c:choose>
 						<c:when test="${pixlrDTO.reflectOnActivity}">
 							<button class="btn btn-primary" onclick="javascript:document.getElementById('learningForm').action = '<lams:WebAppURL />learning/openNotebook.do';">
Index: lams_tool_preview/web/pages/learning/comment.jsp
===================================================================
diff -u -r1a95fab3ccfb6157bf176c530eb7ae5c0900bdd7 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_preview/web/pages/learning/comment.jsp	(.../comment.jsp)	(revision 1a95fab3ccfb6157bf176c530eb7ae5c0900bdd7)
+++ lams_tool_preview/web/pages/learning/comment.jsp	(.../comment.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -103,7 +103,7 @@
 							
 							rows += '<tr>';
 
-							rows += '<td class="username" width="20%"><div class="pull-left roffset5">';
+							rows += '<td class="username" width="20%"><div class="float-start roffset5">';
 							rows += definePortrait( userData["itemDescription2"], itemId, 'small', true, '${lams}' );
 							rows += '</div><span class="portrait-sm-lineheight">';
 							rows += userData["itemDescription"];
Index: lams_tool_preview/web/pages/learning/learning.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_preview/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_preview/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -143,22 +143,22 @@
 
 		<div class="voffset5" id="buttondiv">
 		
-		<div class=" pull-left">		
+		<div class="float-start">		
 		<span id="refreshButton" class="btn btn-default" onclick="javascript:refresh();"><fmt:message key="label.refresh"/></span>
 		</div>
 		
-		<div class="pull-right" id="buttonNextPrevDiv">		
-		<c:if test="${stepNumber > 1}">
-			<button type="button" id="prevButton" class="btn btn-default" onclick="javascript:${method}(false);"><fmt:message key="label.previous"/></button>
-		</c:if>
-		<c:choose>
-			<c:when test="${stepNumber == numCriteria}">
-				<button type="button" id="finishButton" class="btn btn-primary" onclick="javascript:${method}(true);">${finishButtonLabel}</button>
-			</c:when>
-			<c:otherwise>
-				<button type="button" id="finishButton" class="btn btn-default" onclick="javascript:${method}(true);"><fmt:message key="label.next"/></button>
-			</c:otherwise>
-		</c:choose>
+		<div class="activity-bottom-buttons" id="buttonNextPrevDiv">		
+			<c:if test="${stepNumber > 1}">
+				<button type="button" id="prevButton" class="btn btn-default" onclick="javascript:${method}(false);"><fmt:message key="label.previous"/></button>
+			</c:if>
+			<c:choose>
+				<c:when test="${stepNumber == numCriteria}">
+					<button type="button" id="finishButton" class="btn btn-primary" onclick="javascript:${method}(true);">${finishButtonLabel}</button>
+				</c:when>
+				<c:otherwise>
+					<button type="button" id="finishButton" class="btn btn-default" onclick="javascript:${method}(true);"><fmt:message key="label.next"/></button>
+				</c:otherwise>
+			</c:choose>
 		</div>
 		</div>				
 	
Index: lams_tool_preview/web/pages/learning/learningHiddenUser.jsp
===================================================================
diff -u -r1042117ad93a6a9f93d8b1c8be7e718b7efd383f -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_preview/web/pages/learning/learningHiddenUser.jsp	(.../learningHiddenUser.jsp)	(revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f)
+++ lams_tool_preview/web/pages/learning/learningHiddenUser.jsp	(.../learningHiddenUser.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -24,27 +24,16 @@
 	</c:set>
 	<lams:Page type="learner" title="${title}">
 	
-		<div class="row no-gutter">
-			<div
-				class="col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
-				<div class="alert alert-info">
-					<fmt:message key="label.removed.user.warning" />
-				</div>
-			</div>
-		</div>
+		<lams:Alert5 type="info" id="removed-user-info" close="false">
+			<fmt:message key="label.removed.user.warning" />
+		</lams:Alert5>
 		
-		<div class="row no-gutter">
-			<div class="col-xs-12">
-				
-			</div>
-		</div>
+		<div class="activity-bottom-buttons">
+			<a href="javascript:location.reload(true);"	class="btn btn-default">
+				<fmt:message key="button.try.again" />
+			</a>
 		
-		<div>
-		<a href="javascript:location.reload(true);"	class="btn btn-default voffset5">
-					<fmt:message key="button.try.again" />
-				</a>
-		
-			<a href="#nogo" path="FinishButton" id="finishButton" onclick="return finishSession()" class="btn btn-primary voffset5 pull-right na">
+			<a href="#nogo" path="FinishButton" id="finishButton" onclick="return finishSession()" class="btn btn-primary na">
 				<fmt:message key="label.finished" />
 			</a>
 		</div>
Index: lams_tool_preview/web/pages/learning/notebook.jsp
===================================================================
diff -u -r9c0bad6d6294016233cb66d35e3cb6b7bd8537d9 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_preview/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 9c0bad6d6294016233cb66d35e3cb6b7bd8537d9)
+++ lams_tool_preview/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -39,8 +39,8 @@
 			
 			<form:textarea id="focused" rows="5" path="entryText" cssClass="form-control"></form:textarea>
 
-			<div class="space-bottom-top align-right">
-				<a href="#nogo" class="btn btn-primary voffset10 pull-right na" id="finishButton">
+			<div class="activity-bottom-buttons">
+				<a href="#nogo" class="btn btn-primary na" id="finishButton">
 					<c:choose>
 						<c:when test="${sessionMap.isLastActivity}">
 							<fmt:message key="label.finish" />
Index: lams_tool_preview/web/pages/learning/results.jsp
===================================================================
diff -u -r9c87eb663c98f86c544b5b40cca172d40b3cdc3e -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_preview/web/pages/learning/results.jsp	(.../results.jsp)	(revision 9c87eb663c98f86c544b5b40cca172d40b3cdc3e)
+++ lams_tool_preview/web/pages/learning/results.jsp	(.../results.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -155,26 +155,26 @@
 	<!-- End Reflection -->
 
 	<c:if test="${!peerreview.lockWhenFinished}">
-		<a href="#nogo" class="btn btn-default voffset5 pull-left voffset20" onclick="redoRatings();">
+		<a href="#nogo" class="btn btn-default voffset5 float-start voffset20" onclick="redoRatings();">
 			<fmt:message key="label.redo" />
 		</a>
 	</c:if>	
 
 	<c:if test="${mode != 'teacher'}">
-		<div>
+		<div class="activity-bottom-buttons">
 			<c:choose>			
 				<c:when test="${sessionMap.reflectOn and empty sessionMap.reflectEntry}">
-					<a href="#nogo" id="continueButton" onclick="return continueReflect()" class="btn btn-default voffset5 pull-right voffset20">
+					<a href="#nogo" id="continueButton" onclick="return continueReflect()" class="btn btn-default">
 						<fmt:message key="label.continue" />
 					</a>
 				</c:when>
 				<c:when test="${sessionMap.isLastActivity}">
-					<a href="#nogo" id="finishButton" class="btn btn-primary voffset5 pull-right na voffset20">
+					<a href="#nogo" id="finishButton" class="btn btn-primary na">
 						<fmt:message key="label.finish" />
 					</a>
 				</c:when>		
 				<c:otherwise>
-					<a href="#nogo" id="finishButton" class="btn btn-primary voffset5 pull-right na voffset20">
+					<a href="#nogo" id="finishButton" class="btn btn-primary na">
 						<fmt:message key="label.finished" />
 					</a>
 				</c:otherwise>
Index: lams_tool_preview/web/pages/learning/star.jsp
===================================================================
diff -u -r1a95fab3ccfb6157bf176c530eb7ae5c0900bdd7 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_preview/web/pages/learning/star.jsp	(.../star.jsp)	(revision 1a95fab3ccfb6157bf176c530eb7ae5c0900bdd7)
+++ lams_tool_preview/web/pages/learning/star.jsp	(.../star.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -101,7 +101,7 @@
 							
 							rows += '<tr>';
 
-							rows += '<td class="username"><div class="pull-left roffset5">';
+							rows += '<td class="username"><div class="float-start roffset5">';
 							rows += definePortrait( userData["itemDescription2"], itemId, 'small', true, '${lams}' );
 							rows += '</div><span class="portrait-sm-lineheight">';
 							rows += userData["itemDescription"];
Index: lams_tool_sbmt/web/learner/notebook.jsp
===================================================================
diff -u -rc508d4130028a481087f0a08d6987713ab55239d -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_sbmt/web/learner/notebook.jsp	(.../notebook.jsp)	(revision c508d4130028a481087f0a08d6987713ab55239d)
+++ lams_tool_sbmt/web/learner/notebook.jsp	(.../notebook.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -18,8 +18,8 @@
 		<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true" />
 	</div>
 	<hr class="mx-5">
+	
 	<form:form action="submitReflection.do" method="post" onsubmit="disableFinishButton();" modelAttribute="refForm" id="refForm">
-
 		<div class="container-lg">
 
 			<div class="card lcard lcard-no-borders shadow mb-3">
@@ -35,7 +35,6 @@
 				</div>
 			</div>
 
-
 			<div class="activity-bottom-buttons">
 				<button class="btn btn-primary" id="finishButton">
 
@@ -51,7 +50,6 @@
 				</button>
 			</div>
 		</div>
-	
 	</form:form>
 
 </lams:PageLearner>
\ No newline at end of file
Index: lams_tool_sbmt/web/learner/submissionDeadline.jsp
===================================================================
diff -u -rc508d4130028a481087f0a08d6987713ab55239d -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_sbmt/web/learner/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision c508d4130028a481087f0a08d6987713ab55239d)
+++ lams_tool_sbmt/web/learner/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -27,14 +27,14 @@
 		<div class="activity-bottom-buttons">
 			<c:choose>
 				<c:when test="${sessionMap.reflectOn and (not sessionMap.userFinished)}">
-					<button name="continueButton" onclick="javascript:notebook();" class="btn btn-primary pull-right">
+					<button name="continueButton" onclick="javascript:notebook();" class="btn btn-primary">
 						<fmt:message key="label.continue" />
 					</button>
 				</c:when>
 				<c:otherwise>
-					<a href="#nogo" name="finishButton" onclick="javascript:finish();"
-						class="btn btn-primary pull-right na" id="finishButton">
-						<span class="nextActivity"> <c:choose>
+					<a href="#nogo" name="finishButton" onclick="javascript:finish();" class="btn btn-primary na" id="finishButton">
+						<span class="nextActivity"> 
+							<c:choose>
 								<c:when test="${isLastActivity}">
 									<fmt:message key="button.submit" />
 								</c:when>
@@ -47,8 +47,6 @@
 				</c:otherwise>
 			</c:choose>
 		</div>
-	
 	</div>
 
-
 </lams:PageLearner>
Index: lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp
===================================================================
diff -u -r2de8f805211b6433aff4efd6fa9275a1b9933033 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp	(.../fileinfo.jsp)	(revision 2de8f805211b6433aff4efd6fa9275a1b9933033)
+++ lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp	(.../fileinfo.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -28,7 +28,7 @@
 		<c:choose>
 		<c:when test="${fileInfo.removed and empty updateMode}">
 			<a href="javascript:restoreLearnerFile(${fileInfo.submissionID},${toolSessionID},${fileInfo.owner.userID},'${fileInfo.filePath}');" class="btn btn-xs btn-default loffset10">
-				<i class="fa fa-life-saver" title="<fmt:message key="label.monitoring.original.learner.file.restore" />"></i> <span class="hidden-xs"><fmt:message key="label.monitoring.original.learner.file.restore" /></span>
+				<i class="fa fa-life-saver" title="<fmt:message key="label.monitoring.original.learner.file.restore" />"></i> <span class="d-none d-sm-block"><fmt:message key="label.monitoring.original.learner.file.restore" /></span>
 			</a>
 		</c:when>
 	
@@ -37,17 +37,17 @@
 				<lams:WebAppURL/>download/?uuid=${fileInfo.displayUuid}&versionID=${fileInfo.versionID}&preferDownload=false
 			</c:set>
 			<a href="javascript:launchInstructionsPopup('${viewURL}')" class="btn btn-xs btn-default">
-				<i class="fa fa-eye" title="<fmt:message key="label.view" />"></i> <span class="hidden-xs"><fmt:message key="label.view" /></span>
+				<i class="fa fa-eye" title="<fmt:message key="label.view" />"></i> <span class="d-none d-sm-block"><fmt:message key="label.view" /></span>
 			</a>
 			<c:set var="downloadURL">
 				<lams:WebAppURL/>download/?uuid=${fileInfo.displayUuid}&versionID=${fileInfo.versionID}&preferDownload=true
 			</c:set>
 			<a href="${downloadURL}" class="btn btn-xs btn-default loffset10">
-				<i class="fa fa-download" title="<fmt:message key="label.download" />"></i> <span class="hidden-xs"><fmt:message key="label.download" /></span>
+				<i class="fa fa-download" title="<fmt:message key="label.download" />"></i> <span class="d-none d-sm-block"><fmt:message key="label.download" /></span>
 			</a>
 			<c:if test="${empty updateMode}">
 				<a href="javascript:removeLearnerFile(${fileInfo.submissionID},${toolSessionID},${fileInfo.owner.userID},'${fileInfo.filePath}');" class="btn btn-xs btn-danger loffset10">
-					<i class="fa fa-trash" title="<fmt:message key="label.monitoring.original.learner.file.delete" />"></i> <span class="hidden-xs"><fmt:message key="label.monitoring.original.learner.file.delete" /></span>
+					<i class="fa fa-trash" title="<fmt:message key="label.monitoring.original.learner.file.delete" />"></i> <span class="d-none d-sm-block"><fmt:message key="label.monitoring.original.learner.file.delete" /></span>
 				</a>
 			</c:if>
 		</c:otherwise>
Index: lams_tool_sbmt/web/monitoring/mark/filelist.jsp
===================================================================
diff -u -r2de8f805211b6433aff4efd6fa9275a1b9933033 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_sbmt/web/monitoring/mark/filelist.jsp	(.../filelist.jsp)	(revision 2de8f805211b6433aff4efd6fa9275a1b9933033)
+++ lams_tool_sbmt/web/monitoring/mark/filelist.jsp	(.../filelist.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -13,7 +13,7 @@
 	<div id="updateMarksButton" class="pull-right">
 		<a href="javascript:updateMark(${fileInfo.submissionID},${fileInfo.reportID},${toolSessionID},${fileInfo.owner.userID});" 
 				  name="submit" class="btn btn-xs btn-default">
-			<i class="fa fa-pencil-square-o" title="<fmt:message key="label.monitoring.updateMarks.button" />"></i> <span class="hidden-xs"><fmt:message key="label.monitoring.updateMarks.button" /></span>
+			<i class="fa fa-pencil-square-o" title="<fmt:message key="label.monitoring.updateMarks.button" />"></i> <span class="d-none d-sm-block"><fmt:message key="label.monitoring.updateMarks.button" /></span>
 		</a>
 	</div>	
 </dd>
Index: lams_tool_scribe/web/pages/learning/instructions.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_scribe/web/pages/learning/instructions.jsp	(.../instructions.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_scribe/web/pages/learning/instructions.jsp	(.../instructions.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -74,13 +74,15 @@
 		
 			</c:if>
 		
-			<form:form action="learning/startActivity.do" modelAttribute="learningForm">
-				<form:hidden path="toolSessionID" />
-				<form:hidden path="mode" value="${MODE}" />
-				<button class="btn btn-primary voffset10 pull-right">
-					<fmt:message key="button.continue" />
-				</button>
-			</form:form>
+			<div class="activity-bottom-buttons">
+				<form:form action="learning/startActivity.do" modelAttribute="learningForm">
+					<form:hidden path="toolSessionID" />
+					<form:hidden path="mode" value="${MODE}" />
+					<button class="btn btn-primary">
+						<fmt:message key="button.continue" />
+					</button>
+				</form:form>
+			</div>
 		
 		</lams:Page>
 	</body>
Index: lams_tool_scribe/web/pages/learning/learning.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_scribe/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_scribe/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -134,7 +134,7 @@
 			<%@include file="/pages/parts/voteDisplay.jsp"%>
 		
 			<h4>
-				<abbr class="pull-right hidden-xs"
+				<abbr class="float-end d-none d-sm-block"
 					title="<fmt:message key="message.learnerInstructions2" ><fmt:param value="${appointedScribe}"/></fmt:message>&nbsp;<fmt:message key="message.learnerInstructions3" />"><i
 					class="fa fa-question-circle text-info"></i></abbr>
 				<fmt:message key="heading.report" />
@@ -150,7 +150,7 @@
 									<c:out value="${reportDTO.headingDTO.headingText}" escapeXml="false" />
 								</div>
 								<div class="panel-body">
-									<abbr class="pull-right hidden-xs" title="<fmt:message key="label.scribe.posted" />"><i
+									<abbr class="float-end d-none d-sm-block" title="<fmt:message key="label.scribe.posted" />"><i
 										class="fa fa-xs fa-question-circle text-info"></i></abbr>
 		
 									<c:set var="entry">
@@ -166,7 +166,7 @@
 		
 				<div class="row">
 					<div class="col-xs-12" id="agreeButton">
-						<button class="btn btn-success pull-left" onClick="javascript:submitApproval()">
+						<button class="btn btn-success float-start" onClick="javascript:submitApproval()">
 							<fmt:message key="button.agree" />
 						</button>
 					</div>
Index: lams_tool_scribe/web/pages/learning/notebook.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_scribe/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_scribe/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -51,8 +51,8 @@
 				<form:textarea rows="5" id="focused" path="entryText"
 					cssClass="form-control"></form:textarea>
 		
-				
-					<a href="#nogo" class="btn btn-primary voffset10 pull-right na" id="finishButton">
+				<div class="activity-bottom-buttons">
+					<a href="#nogo" class="btn btn-primary na" id="finishButton">
 						<span class="nextActivity">
 							<c:choose>
 			 					<c:when test="${isLastActivity}">
@@ -64,6 +64,7 @@
 			 				</c:choose>
 			 			</span>
 					</a>
+				</div>
 		
 			</form:form>
 		</lams:Page>
Index: lams_tool_scribe/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u -rd5fa41792bdb2657d0d53c35126a64604510d18a -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_scribe/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision d5fa41792bdb2657d0d53c35126a64604510d18a)
+++ lams_tool_scribe/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -18,25 +18,24 @@
     }
 </script>
 
-<div class="voffset10">
+<div class="activity-bottom-buttons">
 	<form:form action="${(scribeUserDTO.finishedActivity == 'false' and scribeDTO.reflectOnActivity == 'true') ? '/lams/tool/lascrb11/learning/openNotebook.do' : '/lams/tool/lascrb11/learning/finishActivity.do'}" modelAttribute="learningForm" method="post" onsubmit="disableFinishButton()" id="learningForm">
 		<form:hidden path="scribeUserUID" value="${scribeUserDTO.uid}" />
 		<c:choose>
-			<c:when
-				test="${!scribeUserDTO.finishedActivity and scribeDTO.reflectOnActivity}">
-
-				<button class="btn btn-primary pull-right">
+			<c:when test="${!scribeUserDTO.finishedActivity and scribeDTO.reflectOnActivity}">
+				<button class="btn btn-primary">
 					<fmt:message key="button.continue" />
 				</button>
-
 			</c:when>
+			
 			<c:otherwise>
-				<a href="#nogo" class="btn btn-primary pull-right na" id="finishButton">
+				<a href="#nogo" class="btn btn-primary na" id="finishButton">
 					<span class="nextActivity">
 						<c:choose>
 		 					<c:when test="${isLastActivity}">
 		 						<fmt:message key="button.submitActivity" />
 		 					</c:when>
+		 					
 		 					<c:otherwise>
 		 		 				<fmt:message key="button.finish" />
 		 					</c:otherwise>
Index: lams_tool_scribe/web/pages/learning/scribe.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_scribe/web/pages/learning/scribe.jsp	(.../scribe.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_scribe/web/pages/learning/scribe.jsp	(.../scribe.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -138,7 +138,7 @@
 			</div>
 		
 			<h4>
-				<abbr class="pull-right hidden-xs" title="<fmt:message key="message.scribeInstructions2" />&nbsp;<fmt:message key="message.scribeInstructions3" />"><i
+				<abbr class="float-end d-none d-sm-block" title="<fmt:message key="message.scribeInstructions2" />&nbsp;<fmt:message key="message.scribeInstructions3" />"><i
 											class="fa fa-question-circle text-info"></i></abbr>
 				<fmt:message key="heading.report" />
 			</h4>
@@ -152,7 +152,7 @@
 							<div class="panel-body">
 		
 								<div class="panel-warning panel-body bg-warning">
-									<abbr class="pull-right hidden-xs" title="<fmt:message key="label.what.others.see" />"><i
+									<abbr class="float-end d-none d-sm-block" title="<fmt:message key="label.what.others.see" />"><i
 										class="fa fa-xs fa-question-circle text-info"></i></abbr>
 		
 									<c:set var="entry">
@@ -194,7 +194,7 @@
 			</form:form>
 		
 			<div id="agreeButton">
-				<a id="agreeButton" class="btn btn-success pull-left" onclick="javascript:submitApproval();"> 
+				<a id="agreeButton" class="btn btn-success float-start" onclick="javascript:submitApproval();"> 
 					<fmt:message key="button.agree" />
 				</a>
 			</div>
Index: lams_tool_scribe/web/pages/learning/waitForScribe.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_scribe/web/pages/learning/waitForScribe.jsp	(.../waitForScribe.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_scribe/web/pages/learning/waitForScribe.jsp	(.../waitForScribe.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -36,9 +36,10 @@
 				<c:out value="${msg}"/>
 			</p>
 		
-		
-				<a href="javascript:location.reload(true);" class="btn btn-primary voffset10 pull-right"><fmt:message
-			key="button.try.again" /> </a>
+			<div class="activity-bottom-buttons">
+				<a href="javascript:location.reload(true);" class="btn btn-primary"><fmt:message
+					key="button.try.again" /> </a>
+			</div>
 		</lams:Page>
 	</body>
 </lams:html>
\ No newline at end of file
Index: lams_tool_spreadsheet/web/pages/learning/learning.jsp
===================================================================
diff -u -rd5fa41792bdb2657d0d53c35126a64604510d18a -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_spreadsheet/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision d5fa41792bdb2657d0d53c35126a64604510d18a)
+++ lams_tool_spreadsheet/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -117,8 +117,8 @@
 						</iframe>
 				
 					<c:if test="${!userIsMarked && (mode != 'teacher') && (spreadsheet.learnerAllowedToSave) && !(sessionMap.lockOnFinish && sessionMap.userFinished)}">
-						<div class="space-bottom-top align-right">
-							<button name="SaveButton" onclick="return saveUserSpreadsheet('saveUserSpreadsheet')" class="btn btn-primary voffset10 pull-right">
+						<div class="activity-bottom-buttons">
+							<button name="SaveButton" onclick="return saveUserSpreadsheet('saveUserSpreadsheet')" class="btn btn-primary">
 								<fmt:message key="label.save" />
 							</button>
 						</div>
@@ -145,7 +145,7 @@
 							</div>
 
 							<c:if test="${hasEditRight}">
-								<button name="forwardtoReflection" class="btn btn-default pull-left"
+								<button name="forwardtoReflection" class="btn btn-default float-start"
 									onclick="submitMethod('forwardtoReflection');">
 									<fmt:message key="label.edit" />
 								</button>
@@ -161,7 +161,7 @@
 							</c:choose>
 
 							<c:if test="${mode != 'teacher'}">
-								<button name="FinishButton" onclick="return continueReflect()" class="btn btn-default voffset10 pull-left">
+								<button name="FinishButton" onclick="return continueReflect()" class="btn btn-default voffset10 float-start">
 								<fmt:message key="label.edit" />
 								</button>
 							</c:if>
@@ -173,15 +173,15 @@
 		</c:if>
 
 		<c:if test="${mode != 'teacher'}">
-			<div class="space-bottom-top align-right">
+			<div class="activity-bottom-buttons">
 				<c:choose>
 					<c:when	test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">				
-						<button name="FinishButton" onclick="return continueReflect()" class="btn btn-primary pull-right">
+						<button name="FinishButton" onclick="return continueReflect()" class="btn btn-primary">
 							<fmt:message key="label.continue" />
 						</button>
 					</c:when>
 					<c:otherwise>
-						<a href="#nogo" class="btn btn-primary pull-right na" id="finishButton">
+						<a href="#nogo" class="btn btn-primary na" id="finishButton">
 							<c:choose>
 			 					<c:when test="${sessionMap.isLastActivity}">
 			 						<fmt:message key="label.submit" />
Index: lams_tool_spreadsheet/web/pages/learning/notebook.jsp
===================================================================
diff -u -rd5fa41792bdb2657d0d53c35126a64604510d18a -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_spreadsheet/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision d5fa41792bdb2657d0d53c35126a64604510d18a)
+++ lams_tool_spreadsheet/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -39,16 +39,18 @@
 
 			<textarea id="focused" rows="5" name="entryText" class="form-control">${reflectionForm.entryText}</textarea>
 
-			<a href="#nogo" class="btn btn-primary voffset5 pull-right na" id="finishButton">
-				<c:choose>
-					<c:when test="${sessionMap.isLastActivity}">
-						<fmt:message key="label.submit" />
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="label.finished" />
-					</c:otherwise>
-				</c:choose>
-			</a>
+			<div class="activity-bottom-buttons">
+				<a href="#nogo" class="btn btn-primary na" id="finishButton">
+					<c:choose>
+						<c:when test="${sessionMap.isLastActivity}">
+							<fmt:message key="label.submit" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="label.finished" />
+						</c:otherwise>
+					</c:choose>
+				</a>
+			</div>
 
 	</form:form>
 	
Index: lams_tool_survey/web/pages/learning/learning.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_survey/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_survey/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -72,47 +72,45 @@
 
 			<%-- Display button according to different situation --%>
 			<%--POSITION: 0=middle of survey, 1=first question, 2=last question, 3=Only one question available--%>
-			<c:choose>
-				<c:when test="${(sessionMap.showOnOnePage && (empty questionSeqID or questionSeqID == 0)) or position == 3}">
-					<div class="right-buttons voffset10">
+			<div class="activity-bottom-buttons">
+				<c:choose>
+					<c:when test="${(sessionMap.showOnOnePage && (empty questionSeqID or questionSeqID == 0)) or position == 3}">
 						<form:button onclick="submit" path="doSurvey" value="Done" disabled="${sessionMap.finishedLock}"
-							class="btn btn-sm btn-primary pull-right">
+							class="btn btn-primary">
 							<fmt:message key="label.submit.survey" />
 						</form:button>
-						
-					</div>
-				</c:when>
-				<c:otherwise>
-					<c:set var="preChecked" value="true" />
-					<c:if test="${position == 2 || position == 0}">
-						<c:set var="preChecked" value="false" />
-					</c:if>
-					<c:set var="nextChecked" value="true" />
-					<c:if test="${position == 1 || position == 0}">
-						<c:set var="nextChecked" value="false" />
-					</c:if>
-					<div class="pull-left voffset10"> 
-						<form:button path="PreviousButton" onclick="previousQuestion()"
-							class="btn btn-sm btn-default" disabled="${preChecked}">
-							<fmt:message key="label.previous" />
-						</form:button>
-					</div>
-					<div class="pull-right voffset10"> 
-					<c:if test="${position != 2}">
-						<form:button path="NextButton" onclick="nextQuestion()" class="btn btn-sm btn-default" disabled="${nextChecked}">
-							<fmt:message key="label.next" />
-						</form:button>
-					</c:if>
-					 <c:if test="${position == 2}">
-						<form:button onclick="submit" path="doSurvey" disabled="${sessionMap.finishedLock}" class="btn btn-sm btn-primary">
-							<fmt:message key="label.submit.survey" />
-						</form:button>
-					</c:if>
-					</div>
-				</c:otherwise>
-			</c:choose>
-			<div id="footer"></div>
-			<!--closes footer-->
+					</c:when>
+				
+					<c:otherwise>
+						<c:set var="preChecked" value="true" />
+						<c:if test="${position == 2 || position == 0}">
+							<c:set var="preChecked" value="false" />
+						</c:if>
+						<c:set var="nextChecked" value="true" />
+						<c:if test="${position == 1 || position == 0}">
+							<c:set var="nextChecked" value="false" />
+						</c:if>
+						<div class="float-start"> 
+							<form:button path="PreviousButton" onclick="previousQuestion()"
+								class="btn btn-secondary" disabled="${preChecked}">
+								<fmt:message key="label.previous" />
+							</form:button>
+						</div>
+
+						<c:if test="${position != 2}">
+							<form:button path="NextButton" onclick="nextQuestion()" class="btn btn-secondary" disabled="${nextChecked}">
+								<fmt:message key="label.next" />
+							</form:button>
+						</c:if>
+						 <c:if test="${position == 2}">
+							<form:button onclick="submit" path="doSurvey" disabled="${sessionMap.finishedLock}" class="btn btn-primary">
+								<fmt:message key="label.submit.survey" />
+							</form:button>
+						</c:if>
+					</c:otherwise>
+				</c:choose>
+			</div>
+
 		</lams:Page>
 	</form:form>
 </body>
Index: lams_tool_survey/web/pages/learning/notebook.jsp
===================================================================
diff -u -rd5fa41792bdb2657d0d53c35126a64604510d18a -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_survey/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision d5fa41792bdb2657d0d53c35126a64604510d18a)
+++ lams_tool_survey/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -37,15 +37,13 @@
 
 			<form:textarea rows="5" id="focused" path="entryText" cssClass="form-control" />
 
-			<div class="voffset10">
-				<button class="btn btn-primary pull-right na" id="finishButton" type="button">
+	
+			<div class="activity-bottom-buttons">
+				<button class="btn btn-primary na" id="finishButton" type="button">
 					<fmt:message key="label.finish" />
 				</button>
 			</div>
 
-
-			<div id="footer"></div>
-			<!--closes footer-->
 		</lams:Page>
 	</form:form>
 
Index: lams_tool_survey/web/pages/learning/question.jsp
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_survey/web/pages/learning/question.jsp	(.../question.jsp)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_tool_survey/web/pages/learning/question.jsp	(.../question.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -3,7 +3,7 @@
 <div class="sbox voffset5">
 	<div class="sbox-heading clearfix">
 		<c:if test="${not question.optional}">
-			<abbr class="pull-right" title="<fmt:message key='label.answer.required'/>"><i class="fa fa-xs fa-asterisk text-danger pull-right"></i></abbr>
+			<abbr class="float-end" title="<fmt:message key='label.answer.required'/>"><i class="fa fa-xs fa-asterisk text-danger pull-right"></i></abbr>
 		</c:if>
 
 		<c:out value="${question.description}" escapeXml="false" />
Index: lams_tool_survey/web/pages/learning/result.jsp
===================================================================
diff -u -rd5fa41792bdb2657d0d53c35126a64604510d18a -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_survey/web/pages/learning/result.jsp	(.../result.jsp)	(revision d5fa41792bdb2657d0d53c35126a64604510d18a)
+++ lams_tool_survey/web/pages/learning/result.jsp	(.../result.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -93,8 +93,8 @@
 			<div class="sbox voffset5">
 				<div class="sbox-heading clearfix">
 					<c:if test="${not question.optional}">
-						<abbr class="pull-right" title="<fmt:message key='label.answer.required'/>"><i
-							class="fa fa-xs fa-asterisk text-danger pull-right"></i></abbr>
+						<abbr class="float-end" title="<fmt:message key='label.answer.required'/>"><i
+							class="fa fa-xs fa-asterisk text-danger float-end"></i></abbr>
 					</c:if>
 
 					<c:set var="question" value="${element.value}" />
@@ -148,7 +148,7 @@
 
 		<c:if test="${not sessionMap.finishedLock}">
 			<div class="voffset5">
-				<button property="RetakeButton" onclick="return retakeSurvey(-1)" class="btn btn-sm btn-default pull-left">
+				<button property="RetakeButton" onclick="return retakeSurvey(-1)" class="btn btn-sm btn-default float-start">
 					<fmt:message key="label.retake.survey" />
 				</button>
 			</div>
@@ -180,33 +180,33 @@
 					</c:choose>
 
 					<button property="ContinueButton" onclick="return continueReflect()"
-						class="btn voffset5 btn-sm btn-default pull-left">
+						class="btn voffset5 btn-sm btn-default float-start">
 						<fmt:message key="label.edit" />
 					</button>
 				</div>
 			</div>
 		</c:if>
 
 		<c:if test="${sessionMap.mode != 'teacher'}">
-			<div class="pull-right voffset10">
+			<div class="activity-bottom-buttons">
 				<c:choose>
 					<c:when test="${sessionMap.showOtherUsersAnswers}">
 						<button property="otherUsersAnswersButton" onclick="return showOtherUsersAnswers()"
-							class="btn btn-sm btn-default">
+							class="btn btn-default">
 							<fmt:message key="label.view.all.responses" />
 						</button>
 					</c:when>
 
 					<c:when test="${sessionMap.reflectOn}">
 						<button property="ContinueButton" onclick="return continueReflect()"
-							class="btn btn-sm btn-primary pull-right">
+							class="btn btn-primary">
 							<fmt:message key="label.continue" />
 						</button>
 					</c:when>
 
 					<c:otherwise>
 						<button type="submit" id="finishButton"
-							class="btn btn-sm btn-primary pull-right na">
+							class="btn btn-primary na">
 							<c:choose>
 								<c:when test="${sessionMap.isLastActivity}">
 									<fmt:message key="label.submit" />
Index: lams_tool_survey/web/pages/learning/resultOtherUsers.jsp
===================================================================
diff -u -r738f324bd6cd4f85fa2419e193830e11787495fc -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_survey/web/pages/learning/resultOtherUsers.jsp	(.../resultOtherUsers.jsp)	(revision 738f324bd6cd4f85fa2419e193830e11787495fc)
+++ lams_tool_survey/web/pages/learning/resultOtherUsers.jsp	(.../resultOtherUsers.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -123,8 +123,8 @@
 			<div class="sbox voffset10">
 				<div class="sbox-heading clearfix">
 					<c:if test="${not question.optional}">
-						<abbr class="pull-right" title="<fmt:message key='label.answer.required'/>"><i
-							class="fa fa-xs fa-asterisk text-danger pull-right"></i></abbr>
+						<abbr class="float-end" title="<fmt:message key='label.answer.required'/>"><i
+							class="fa fa-xs fa-asterisk text-danger float-end"></i></abbr>
 					</c:if>
 
 					<c:set var="question" value="${element.value}" />
@@ -200,7 +200,7 @@
 						</c:otherwise>
 					</c:choose>
 
-					<button property="ContinueButton" onclick="return continueReflect()" class="btn btn-default btn-primary pull-right">
+					<button property="ContinueButton" onclick="return continueReflect()" class="btn btn-secondary float-end">
 						<fmt:message key="label.edit" />
 					</button>
 				</div>
@@ -227,7 +227,7 @@
 						<tr>
 							<th class="first" colspan="2"><c:out value="${question.shortTitle}" /> <%-- Only show pie/bar chart when question is single/multiple choics type --%>
 								<c:if test="${question.type != 3}">
-									<div class="pull-right">
+									<div class="float-end">
 										<c:set var="chartURL"
 											value="${tool}showChart.do?toolSessionID=${sessionMap.toolSessionID}&questionUid=${question.uid}" />
 										<a class="fa fa-lg fa-pie-chart text-primary btn btn-md btn-primary"
@@ -281,18 +281,17 @@
 		</c:if>
 
 		<c:if test="${sessionMap.mode != 'teacher'}">
-			<div class="voffset10">
+			<div class="activity-bottom-buttons">
 				<c:choose>
-
 					<c:when test="${sessionMap.reflectOn}">
-						<button property="ContinueButton" onclick="return continueReflect()" class="btn btn-default btn-primary pull-right">
+						<button property="ContinueButton" onclick="return continueReflect()" class="btn btn-primary">
 							<fmt:message key="label.continue" />
 						</button>
 					</c:when>
 
 					<c:otherwise>
 						<button type="submit" id="finishButton" onclick="return finishSession()"
-							class="btn btn-primary pull-right na">
+							class="btn btn-primary na">
 							<span class="nextActivity"> <c:choose>
 									<c:when test="${sessionMap.isLastActivity}">
 										<fmt:message key="label.submit" />
Index: lams_tool_survey/web/pages/learning/submissionDeadline.jsp
===================================================================
diff -u -rc1d637e4d2786f97672dd38f6e3278d5c4f7b79c -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_survey/web/pages/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision c1d637e4d2786f97672dd38f6e3278d5c4f7b79c)
+++ lams_tool_survey/web/pages/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -61,17 +61,17 @@
 		</c:if>
 
 
-		<div class="voffset10">
+		<div class="activity-bottom-buttons">
 			<c:choose>
 				<c:when test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
 					<a href="#nogo" property="FinishButton" onclick="return continueReflect()"
-						class="btn btn-primary pull-right">
+						class="btn btn-primary">
 						<fmt:message key="label.continue" />
 					</a>
 				</c:when>
 				<c:otherwise>
 					<a href="#nogo" property="FinishButton" styleId="finishButton" onclick="return finishSession()"
-						class="btn btn-primary pull-right na">
+						class="btn btn-primary na">
 						<span class="nextActivity"> <c:choose>
 								<c:when test="${sessionMap.isLastActivity}">
 									<fmt:message key="label.submit" />
Index: lams_tool_task/web/pages/learning/learning.jsp
===================================================================
diff -u -rca136be52df70bbdd506d2383d4d4bd2201a3b3f -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_task/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision ca136be52df70bbdd506d2383d4d4bd2201a3b3f)
+++ lams_tool_task/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -357,7 +357,7 @@
 
 									<c:if test="${mode != 'teacher'}">
 										<button type="submit" id="finishButton" onclick="return continueReflect()"
-											class="btn btn-sm btn-default pull-left voffset10 btn-disable-on-submit">
+											class="btn btn-sm btn-default float-start voffset10 btn-disable-on-submit">
 											<fmt:message key="label.edit" />
 										</button>
 									</c:if>
@@ -379,7 +379,7 @@
 		</c:forEach>
 
 		<c:if test="${(mode != 'teacher') && isRequiredTasksCompleted}">
-			<div class="space-bottom-top align-right">
+			<div class="activity-bottom-buttons">
 
 				<c:choose>
 					<c:when test="${taskList.monitorVerificationRequired && !sessionMap.userVerifiedByMonitor && (mode != 'author')}">
@@ -388,14 +388,14 @@
 
 					<c:when test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
 						<button type="submit" id="finishButton" onclick="return continueReflect()"
-							class="btn btn-primary btn-disable-on-submit voffset10 pull-right">
+							class="btn btn-primary btn-disable-on-submit">
 							<fmt:message key="label.continue" />
 						</button>
 					</c:when>
 
 					<c:otherwise>
 						<button type="submit" id="finishButton"
-							class="btn btn-primary btn-disable-on-submit voffset10 pull-right na">
+							class="btn btn-primary btn-disable-on-submit na">
 							<span class="nextActivity"> <c:choose>
 									<c:when test="${sessionMap.isLastActivity}">
 										<fmt:message key="label.submit" />
Index: lams_tool_task/web/pages/learning/parts/itemlist.jsp
===================================================================
diff -u -r7c46c69de0269005bc00c1e5fd5347f6fe306790 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_task/web/pages/learning/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 7c46c69de0269005bc00c1e5fd5347f6fe306790)
+++ lams_tool_task/web/pages/learning/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -12,7 +12,7 @@
 
 			<div class="panel panel-default">
 				<div class="panel-heading clearfix">
-					<div class="panel-title pull-left" data-toggle="collapse" data-target="#collapse${item.uid}">
+					<div class="panel-title float-start" data-toggle="collapse" data-target="#collapse${item.uid}">
 						<c:out value="${item.title}" escapeXml="true" /> 
 						<c:if test="${!item.createByAuthor && item.createBy != null}">
 							[<c:out value="${item.createBy.firstName} ${item.createBy.lastName}" escapeXml="true" />]
@@ -22,7 +22,7 @@
 						</c:if>
 						</a>
 					</div>
-					<div class="pull-right">
+					<div class="float-end">
 						<c:choose>
 							<c:when test="${item.complete}">
 								<i title="<fmt:message key='label.completed' />" class="fa fa-lg fa-check text-success"></i>
Index: lams_tool_task/web/pages/learning/parts/notebook.jsp
===================================================================
diff -u -rd5fa41792bdb2657d0d53c35126a64604510d18a -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_task/web/pages/learning/parts/notebook.jsp	(.../notebook.jsp)	(revision d5fa41792bdb2657d0d53c35126a64604510d18a)
+++ lams_tool_task/web/pages/learning/parts/notebook.jsp	(.../notebook.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -37,8 +37,8 @@
 
 			<textarea cols="60" id="notebookEntry" name="entryText" class="form-control" rows="5"></textarea>
 
-			<div class="voffset10">
-				<button type="button" class="btn btn-primary pull-right na" id="finishButton">
+			<div class="activity-bottom-buttons">
+				<button type="button" class="btn btn-primary na" id="finishButton">
 					<span class="nextActivity"> <c:choose>
 							<c:when test="${sessionMap.isLastActivity}">
 								<fmt:message key="label.submit" />
Index: lams_tool_task/web/pages/learning/submissionDeadline.jsp
===================================================================
diff -u -rc1d637e4d2786f97672dd38f6e3278d5c4f7b79c -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_task/web/pages/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision c1d637e4d2786f97672dd38f6e3278d5c4f7b79c)
+++ lams_tool_task/web/pages/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -66,17 +66,17 @@
 
 		</c:if>
 
-		<div class="voffset10">
+		<div class="activity-bottom-buttons">
 			<c:choose>
 				<c:when test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
 					<a href="#nogo" id="finishButton" onclick="return continueReflect()"
-						class="btn btn-primary pull-right ">
+						class="btn btn-primary ">
 						<fmt:message key="label.continue" />
 					</a>
 				</c:when>
 				<c:otherwise>
 					<a href="#nogo" id="finishButton" onclick="return finishSession()"
-						class="btn btn-primary pull-right na">
+						class="btn btn-primary na">
 						<span class="nextActivity"> <c:choose>
 								<c:when test="${sessionMap.isLastActivity}">
 									<fmt:message key="label.submit" />
Index: lams_tool_vote/web/learning/AllNominations.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_vote/web/learning/AllNominations.jsp	(.../AllNominations.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_vote/web/learning/AllNominations.jsp	(.../AllNominations.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -131,7 +131,7 @@
 			</table>
 
 
-			<div class="pull-right">
+			<div class="float-end">
 				<c:set var="chartURL" value="${tool}chartGenerator.do?currentSessionId=${voteLearningForm.toolSessionID}" />
 				<a title="<fmt:message key='label.tip.displayPieChart'/>"
 					class="fa fa-pie-chart text-primary btn btn-md btn-primary"
@@ -210,37 +210,38 @@
 
 			<div id="chartDiv" style="height: 220px; display: none;"></div>
 
-
 			<c:if test="${voteGeneralLearnerFlowDTO.reportViewOnly != 'true' }">
-				<button class="btn btn-sm btn-default voffset10 pull-left" onclick="submitMethod('viewAllResults');">
-					<fmt:message key="label.refresh" />
-				</button>
-
-				<c:if test="${voteLearningForm.lockOnFinish != 'true' && hasEditRight}">
-					<button class="btn btn-sm btn-default voffset10 pull-left " onclick="submitMethod('redoQuestionsOk');">
-						<fmt:message key="label.retake" />
+				<div class="activity-bottom-buttons">
+					<button class="btn btn-secondary float-start" onclick="submitMethod('viewAllResults');">
+						<fmt:message key="label.refresh" />
 					</button>
-				</c:if>
-
-				<c:if test="${voteGeneralLearnerFlowDTO.reflection != 'true' || !hasEditRight}">
-					<button type="button"
-						class="btn btn-primary pull-right voffset10 na" id="finishButton">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="button.submitActivity" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="button.endLearning" />
-							</c:otherwise>
-						</c:choose>
-					</button>
-				</c:if>
-
-				<c:if test="${voteGeneralLearnerFlowDTO.reflection == 'true' && hasEditRight}">
-					<button onclick="javascript:submitMethod('forwardtoReflection');" class="btn btn-primary pull-right voffset10">
-						<fmt:message key="label.continue" />
-					</button>
-				</c:if>
+	
+					<c:if test="${voteLearningForm.lockOnFinish != 'true' && hasEditRight}">
+						<button class="btn btn-secondary float-start " onclick="submitMethod('redoQuestionsOk');">
+							<fmt:message key="label.retake" />
+						</button>
+					</c:if>
+	
+					<c:if test="${voteGeneralLearnerFlowDTO.reflection != 'true' || !hasEditRight}">
+						<button type="button"
+							class="btn btn-primary na" id="finishButton">
+							<c:choose>
+								<c:when test="${isLastActivity}">
+									<fmt:message key="button.submitActivity" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="button.endLearning" />
+								</c:otherwise>
+							</c:choose>
+						</button>
+					</c:if>
+	
+					<c:if test="${voteGeneralLearnerFlowDTO.reflection == 'true' && hasEditRight}">
+						<button onclick="javascript:submitMethod('forwardtoReflection');" class="btn btn-primary">
+							<fmt:message key="label.continue" />
+						</button>
+					</c:if>
+				</div>
 			</c:if>
 			</div>
 			<div id="footer"></div>
Index: lams_tool_vote/web/learning/AnswersContent.jsp
===================================================================
diff -u -rf86004309489cb81f283d1962b481b4bbb3facd6 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_vote/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision f86004309489cb81f283d1962b481b4bbb3facd6)
+++ lams_tool_vote/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -206,13 +206,12 @@
 				<form:input cssClass="form-control" path="userEntry" size="30" maxlength="100" />
 			</c:if>
 
-			<form:hidden path="donePreview" />
+			<div class="activity-bottom-buttons">
+				<form:hidden path="donePreview" />
+				<input type="submit" name="continueOptionsCombined" class="btn btn-primary"
+					   value='<fmt:message key="label.submit.vote" />' />
+			</div>
 
-			<input type="submit" name="continueOptionsCombined" class="btn btn-primary pull-right voffset10"
-				   value='<fmt:message key="label.submit.vote" />' />
-
-			<div id="footer"></div>
-
 		</lams:Page>
 
 	</form:form>
Index: lams_tool_vote/web/learning/ExitLearning.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_vote/web/learning/ExitLearning.jsp	(.../ExitLearning.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_vote/web/learning/ExitLearning.jsp	(.../ExitLearning.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -89,7 +89,7 @@
 
 						<c:if
 							test="${voteGeneralLearnerFlowDTO.lockOnFinish == 'false' && hasEditRight && voteGeneralLearnerFlowDTO.learningMode != 'teacher'}">
-							<form:button path="forwardtoReflection" cssClass="btn btn-sm btn-default voffset10 pull-left"
+							<form:button path="forwardtoReflection" cssClass="btn btn-sm btn-default voffset10 float-start"
 								onclick="submitMethod('forwardtoReflection');">
 								<fmt:message key="label.edit" />
 							</form:button>
@@ -100,20 +100,20 @@
 			</c:if>
 
 			<c:if test="${voteGeneralLearnerFlowDTO.learningMode != 'teacher'}">
-				<button type="submit" class="btn btn-primary voffset10 pull-right na"
-					id="finishButton" onclick="submitMethod('learnerFinished')">
-					<c:choose>
-						<c:when test="${isLastActivity}">
-							<fmt:message key="button.submitActivity" />
-						</c:when>
-						<c:otherwise>
-							<fmt:message key="button.endLearning" />
-						</c:otherwise>
-					</c:choose>
-
-				</button>
+				<div class="activity-bottom-buttons">
+					<button type="submit" class="btn btn-primary na"
+						id="finishButton" onclick="submitMethod('learnerFinished')">
+						<c:choose>
+							<c:when test="${isLastActivity}">
+								<fmt:message key="button.submitActivity" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="button.endLearning" />
+							</c:otherwise>
+						</c:choose>
+					</button>
+				</div>
 			</c:if>
-			<div id="footer"></div>
 
 		</lams:Page>
 	</form:form>
Index: lams_tool_vote/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -rd5fa41792bdb2657d0d53c35126a64604510d18a -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_vote/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision d5fa41792bdb2657d0d53c35126a64604510d18a)
+++ lams_tool_vote/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -96,7 +96,7 @@
 							</c:if>
 
 							<c:if test="${hasEditRight}">
-								<input type="submit" name="redoQuestions" class="btn btn-sm btn-default pull-left voffset10"
+								<input type="submit" name="redoQuestions" class="btn btn-sm btn-default float-start voffset10"
 									onclick="submitMethod('redoQuestions');"
 									value='<fmt:message key="label.retake" />?' />
 							</c:if>
@@ -108,34 +108,36 @@
 			</div>
 
 
-			<c:choose>
-				<c:when test="${voteLearningForm.showResults=='true'}">
-					<input type="submit" name="viewAllResults" class="btn btn-primary pull-right"
-						onclick="submitMethod('viewAllResults');"
-						value='<fmt:message key="label.overAllResults" />' />
-				</c:when>
+			<div class="activity-bottom-buttons">
+				<c:choose>
+					<c:when test="${voteLearningForm.showResults=='true'}">
+						<input type="submit" name="viewAllResults" class="btn btn-primary"
+							onclick="submitMethod('viewAllResults');"
+							value='<fmt:message key="label.overAllResults" />' />
+					</c:when>
+	
+					<c:when test="${voteGeneralLearnerFlowDTO.reflection != 'true' || !hasEditRight}">
+						<button type="button" name="learnerFinished" id="finishButton"
+							class="btn btn-primary">
+								<c:choose>
+									<c:when test="${isLastActivity}">
+										<fmt:message key="button.submitActivity" />
+									</c:when>
+									<c:otherwise>
+										<fmt:message key="button.endLearning" />
+									</c:otherwise>
+								</c:choose>
+						</button>
+					</c:when>
+	
+					<c:otherwise>
+						<input type="submit" name="forwardtoReflection" onclick="javascript:submitMethod('forwardtoReflection');"
+							class="btn btn-primary"
+							value='<fmt:message key="label.continue" />' />
+					</c:otherwise>
+				</c:choose>
+			</div>
 
-				<c:when test="${voteGeneralLearnerFlowDTO.reflection != 'true' || !hasEditRight}">
-					<button type="button" name="learnerFinished" id="finishButton"
-						class="btn btn-primary voffset10 pull-right">
-							<c:choose>
-								<c:when test="${isLastActivity}">
-									<fmt:message key="button.submitActivity" />
-								</c:when>
-								<c:otherwise>
-									<fmt:message key="button.endLearning" />
-								</c:otherwise>
-							</c:choose>
-					</button>
-				</c:when>
-
-				<c:otherwise>
-					<input type="submit" name="forwardtoReflection" onclick="javascript:submitMethod('forwardtoReflection');"
-						class="btn btn-primary pull-right"
-						value='<fmt:message key="label.continue" />' />
-				</c:otherwise>
-			</c:choose>
-
 		</lams:Page>
 	</form:form>
 
Index: lams_tool_vote/web/learning/Notebook.jsp
===================================================================
diff -u -rd5fa41792bdb2657d0d53c35126a64604510d18a -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_vote/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision d5fa41792bdb2657d0d53c35126a64604510d18a)
+++ lams_tool_vote/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -48,10 +48,13 @@
 			</div>
 
 			<form:textarea rows="5" path="entryText" cssClass="form-control" styleId="focused" />
-			<button type="button"
-				class="btn btn-primary voffset10 pull-right na" id="finishButton">
-				<fmt:message key="button.endLearning" />
-			</button>
+			
+			<div class="activity-bottom-buttons">
+				<button type="button"
+					class="btn btn-primary na" id="finishButton">
+					<fmt:message key="button.endLearning" />
+				</button>
+			</div>
 
 		</lams:Page>
 
Index: lams_tool_vote/web/learning/RevisitedAllNominations.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_vote/web/learning/RevisitedAllNominations.jsp	(.../RevisitedAllNominations.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_vote/web/learning/RevisitedAllNominations.jsp	(.../RevisitedAllNominations.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -78,7 +78,7 @@
 						</c:if>
 
 						<c:if test="${hasEditRight}">
-							<input type="submit" name="redoQuestionsOk" class="btn btn-sm btn-default voffset10 pull-left"
+							<input type="submit" name="redoQuestionsOk" class="btn btn-sm btn-default voffset10 float-start"
 								onclick="submitMethod('redoQuestionsOk');"
 								value='<fmt:message key="label.retake" />' />
 						</c:if>
@@ -101,7 +101,7 @@
 						</div>
 
 						<c:if test="${voteGeneralLearnerFlowDTO.lockOnFinish == 'false' && hasEditRight}">
-							<form:button path="forwardtoReflection" cssClass="btn btn-sm btn-default voffset10 pull-left"
+							<form:button path="forwardtoReflection" cssClass="btn btn-sm btn-default voffset10 float-start"
 								onclick="submitMethod('forwardtoReflection');">
 								<fmt:message key="label.edit" />
 							</form:button>
@@ -111,20 +111,20 @@
 				</div>
 			</c:if>
 
+			<div class="activity-bottom-buttons">
+				<button type="button" id="finishButton"
+					class="btn btn-primary na">
+					<c:choose>
+							<c:when test="${isLastActivity}">
+								<fmt:message key="button.submitActivity" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="button.endLearning" />
+							</c:otherwise>
+					</c:choose>
+				</button>
+			</div>
 
-			<button type="button" id="finishButton"
-				class="btn btn-primary voffset10 pull-right na">
-				<c:choose>
-						<c:when test="${isLastActivity}">
-							<fmt:message key="button.submitActivity" />
-						</c:when>
-						<c:otherwise>
-							<fmt:message key="button.endLearning" />
-						</c:otherwise>
-				</c:choose>
-			</button>
-			<div id="footer"></div>
-
 		</lams:Page>
 	</form:form>
 
Index: lams_tool_vote/web/learning/RevisitedDisplay.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_vote/web/learning/RevisitedDisplay.jsp	(.../RevisitedDisplay.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_vote/web/learning/RevisitedDisplay.jsp	(.../RevisitedDisplay.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -63,7 +63,7 @@
 </table>
 
 
-<div class="pull-right">
+<div class="float-end">
 	<c:set var="chartURL" value="${tool}chartGenerator.do?currentSessionId=${VoteLearningForm.toolSessionID}" />
 	<a title="<fmt:message key='label.tip.displayPieChart'/>" class="fa fa-pie-chart text-primary btn btn-md btn-primary"
 		onclick="javascript:drawChart('pie', 'chartDiv', '${chartURL}')"></a> <a
Index: lams_tool_vote/web/learning/WaitForLeader.jsp
===================================================================
diff -u -rea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_vote/web/learning/WaitForLeader.jsp	(.../WaitForLeader.jsp)	(revision ea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74)
+++ lams_tool_vote/web/learning/WaitForLeader.jsp	(.../WaitForLeader.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -1,47 +1,7 @@
 <!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-<lams:html>
-<lams:head>
-	<title><fmt:message key="activity.title" /></title>
-
-	<lams:css />
-
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-	<script type="text/javascript">
-		function refresh() {
-			location.reload();
-		}
-
-		//refresh page every 30 sec
-		setTimeout("refresh();", 30000);
-	</script>
-</lams:head>
-<body class="stripes">
-
-	<lams:Page type="learner" title="${content.title}">
-		<h4>
-			<fmt:message key="label.waiting.for.leader" />
-		</h4>
-
-		<div>
-			<fmt:message key="label.users.from.group" />
-		</div>
-
-		<div id="usersInGroup">
-			<c:forEach var="user" items="${groupUsers}">
-				<div class="voffset10 loffset10">
-					<lams:Portrait userId="${user.queUsrId}"/>
-					<span>
-						<c:out value="${user.fullname}" escapeXml="true" />
-					</span>
-				</div>
-			</c:forEach>
-		</div>
-
-		<button onclick="refresh();" class="btn btn-sm btn-primary pull-right">
-			<fmt:message key="label.refresh" />
-		</button>
-	</lams:Page>
-</body>
-</lams:html>
\ No newline at end of file
+<lams:PageLearner title="${sessionMap.content.title}" toolSessionID="${sessionMap.toolSessionID}">
+	<lams:WaitForLeader mode="learner" groupUsers="${groupUsers}"/>	
+</lams:PageLearner>
Index: lams_tool_vote/web/learning/submissionDeadline.jsp
===================================================================
diff -u -r3bb7e0141ae1cc15ccd737c95d90b5762a34ad61 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_vote/web/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 3bb7e0141ae1cc15ccd737c95d90b5762a34ad61)
+++ lams_tool_vote/web/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -42,11 +42,12 @@
 				</fmt:message>
 			</lams:Alert>
 			
+			<div class="activity-bottom-buttons">
 				<c:if test="${voteGeneralLearnerFlowDTO.reflection != 'true'}">
 
 					<button type="submit"  id="finishButton" 
 				      onclick="javascript:submitMethod('learnerFinished')"
-				      class="btn btn-primary voffset10 pull-right na">
+				      class="btn btn-primary na">
 							<c:choose>
 								<c:when test="${isLastActivity}">
 									<fmt:message key="button.submitActivity" />
@@ -62,9 +63,10 @@
 				<c:if test="${voteGeneralLearnerFlowDTO.reflection == 'true'}">
 					<input type="submit" name="forwardtoReflection"
 						onclick="javascript:submitMethod('forwardtoReflection');"
-						class="btn btn-primary voffset10 pull-right"
+						class="btn btn-primary"
 						value='<fmt:message key="label.continue" />' />
 				</c:if>
+			</div>
 
 	</form:form>
 </lams:Page>
Index: lams_tool_wiki/web/pages/learning/notebook.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_wiki/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_wiki/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -48,16 +48,18 @@
 				<div class="form-group">
 					<textarea id="focused" rows="4" name="entryText" class="form-control">${learningForm.entryText}</textarea>
 		
-					<a href="#nogo" class="btn btn-primary voffset5 pull-right na" id="finishButton">
-						<c:choose>
-							<c:when test="${isLastActivity}">
-								<fmt:message key="button.submit" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="button.finish" />
-							</c:otherwise>
-						</c:choose>
-					</a>
+					<div class="activity-bottom-buttons">
+						<a href="#nogo" class="btn btn-primary na" id="finishButton">
+							<c:choose>
+								<c:when test="${isLastActivity}">
+									<fmt:message key="button.submit" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="button.finish" />
+								</c:otherwise>
+							</c:choose>
+						</a>
+					</div>
 				</div>
 			</form:form>
 		</lams:Page>
Index: lams_tool_wiki/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u -rd5fa41792bdb2657d0d53c35126a64604510d18a -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_wiki/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision d5fa41792bdb2657d0d53c35126a64604510d18a)
+++ lams_tool_wiki/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -52,16 +52,16 @@
   <form:form action="openNotebook.do" method="post" onsubmit="disableFinishButton();" modelAttribute="learningForm" id="learningForm">
     <form:hidden path="toolSessionID" id="toolSessionID"/>
     <form:hidden path="mode" value="${mode}" />	
-    <div class="pull-right voffset5" id="finishButtonDiv">
+    
+    <div class="activity-bottom-buttons5" id="finishButtonDiv">
       <c:choose>
         <c:when test="${!userDTO.finishedActivity and wikiDTO.reflectOnActivity}">
-
-          <a href="javascript:continueOrFinish('openNotebook');" class="btn btn-primary"><fmt:message key="button.continue" /></a>
-
+          <a href="javascript:continueOrFinish('openNotebook');" class="btn btn-primary">
+          	<fmt:message key="button.continue" />
+          </a>
         </c:when>
+        
         <c:otherwise>
-
-          <div class="pull-right voffset5">
             <a href="#nogo" class="btn btn-primary na" id="finishButton">
               <c:choose>
                 <c:when test="${isLastActivity}">
@@ -72,7 +72,6 @@
                 </c:otherwise>
               </c:choose>
             </a>
-          </div>
         </c:otherwise>
       </c:choose>
     </div>
Index: lams_tool_wiki/web/pages/learning/wiki.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_wiki/web/pages/learning/wiki.jsp	(.../wiki.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_wiki/web/pages/learning/wiki.jsp	(.../wiki.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -82,7 +82,7 @@
             <div class="panel panel-default">
               <div class="panel-heading panel-learner-title">
                 <c:if test="${currentWikiPage.title != mainWikiPage.title}">
-                  <a class="panel-title panel-learner-title pull-left" href="javascript:changeWikiPage('${fn:escapeXml(mainWikiPage.javaScriptTitle)}')"> ${fn:escapeXml(mainWikiPage.title)}</a>&nbsp;/&nbsp;
+                  <a class="panel-title panel-learner-title float-start" href="javascript:changeWikiPage('${fn:escapeXml(mainWikiPage.javaScriptTitle)}')"> ${fn:escapeXml(mainWikiPage.title)}</a>&nbsp;/&nbsp;
                 </c:if> 
                 <a class="panel-title panel-learner-title"  href="javascript:changeWikiPage('${fn:escapeXml(currentWikiPage.javaScriptTitle)}')">${fn:escapeXml(currentWikiPage.title)}</a>
 
@@ -93,7 +93,7 @@
 
                 <!-- begin wiki menu-->
 
-                <div class="btn-group pull-right">
+                <div class="btn-group float-end">
                   <c:if test="${contentEditable}">
 
                     <a href="javascript:refreshPage();" title="<fmt:message key='label.wiki.refresh.toolTip'/>" type="button" class="btn btn-xs btn-default"><i class="fa fa-xm fa-refresh"></i> <fmt:message key="label.wiki.refresh"/></a>
@@ -233,7 +233,7 @@
                                 <c:set var="lastEditName"><fmt:message key="label.wiki.history.editor.author"/></c:set>
                             </c:when>
                             <c:otherwise>
-                                <c:set var="lastEditPortrait"><div class="pull-right"><lams:Portrait userId="${currentWikiPage.currentWikiContentDTO.editorDTO.userId}"/></div></c:set>
+                                <c:set var="lastEditPortrait"><div class="float-end"><lams:Portrait userId="${currentWikiPage.currentWikiContentDTO.editorDTO.userId}"/></div></c:set>
                                 <c:set var="lastEditName"><c:out value="${currentWikiPage.currentWikiContentDTO.editorDTO.firstName} ${currentWikiPage.currentWikiContentDTO.editorDTO.lastName}" escapeXml="true"/></c:set>
                             </c:otherwise>
                         </c:choose>
@@ -389,7 +389,7 @@
                       </tr>
                       <tr>
                         <td>
-                          <div class="voffset5 pull-right">
+                          <div class="voffset5 float-end">
                             <a href="javascript:changeDiv('view');" class="btn btn-primary"><fmt:message key="button.cancel"/></a> 
                             <a href="javascript:doEditOrAdd('editPage');" class="btn btn-primary"><fmt:message key="label.wiki.savechanges"></fmt:message></a>
                           </div>
@@ -425,8 +425,8 @@
                                          contentFolderID="${contentFolderID}" toolbarSet="CustomWikiLearner">
                           </lams:CKEditor>
 
-                          <a href="javascript:doEditOrAdd('addPage');" class="btn btn-primary pull-right voffset5"><fmt:message key="label.wiki.savechanges"></fmt:message></a> 
-                          <a href="javascript:cancelAdd();changeDiv('view');" class="btn btn-primary pull-right voffset5 roffset5"><fmt:message key="button.cancel"></fmt:message></a>
+                          <a href="javascript:doEditOrAdd('addPage');" class="btn btn-primary float-end voffset5"><fmt:message key="label.wiki.savechanges"></fmt:message></a> 
+                          <a href="javascript:cancelAdd();changeDiv('view');" class="btn btn-primary float-end voffset5 roffset5"><fmt:message key="button.cancel"></fmt:message></a>
 
                         </div>
                       </div>
Index: lams_tool_zoom/web/pages/learning/notebook.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_zoom/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_zoom/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -44,16 +44,19 @@
 			<form:textarea id="focused" rows="5" path="entryText" cssClass="form-control" />
 	
 			<form:hidden path="toolSessionID" />
-			<button type="button" class="btn btn-primary pull-right voffset10 na" id="finishButton">
-				<c:choose>
-					<c:when test="${isLastActivity}">
-						<fmt:message key="button.submit" />
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="button.finish" />
-					</c:otherwise>
-				</c:choose>
-			</button>
+			
+			<div class="activity-bottom-buttons">
+				<button type="button" class="btn btn-primary na" id="finishButton">
+					<c:choose>
+						<c:when test="${isLastActivity}">
+							<fmt:message key="button.submit" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="button.finish" />
+						</c:otherwise>
+					</c:choose>
+				</button>
+			</div>
 		</form:form>
 		
 		<script type="text/javascript">
Index: lams_tool_zoom/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u -rd5fa41792bdb2657d0d53c35126a64604510d18a -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_tool_zoom/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision d5fa41792bdb2657d0d53c35126a64604510d18a)
+++ lams_tool_zoom/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -43,7 +43,7 @@
 					</c:otherwise>
 				</c:choose>
 				</p>
-				<button type="submit" class="btn btn-sm btn-default">
+				<button type="submit" class="btn btn-sm btn-secondary">
 					<fmt:message key="button.edit" />
 				</button>
 			</div>
@@ -54,7 +54,7 @@
 <form:form action="${!userDTO.finishedActivity and contentDTO.reflectOnActivity ? 'openNotebook.do' : 'finishActivity.do'}"
 		   method="post" onsubmit="disableFinishButton();" modelAttribute="learningForm" id="finishForm">
 	<form:hidden path="toolSessionID" />
-	<div class="pull-right voffset10">
+	<div class="activity-bottom-buttons">
 		<c:choose>
 			<c:when test="${!userDTO.finishedActivity and contentDTO.reflectOnActivity}">
 				<button type="submit" class="btn btn-primary"><fmt:message key="button.continue" /></button>
Index: lams_www/web/public/ckeditor-templates/bootsnippets.js
===================================================================
diff -u -rb6e6befa01b244e05a9aa6408e0de4a56327deb0 -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b
--- lams_www/web/public/ckeditor-templates/bootsnippets.js	(.../bootsnippets.js)	(revision b6e6befa01b244e05a9aa6408e0de4a56327deb0)
+++ lams_www/web/public/ckeditor-templates/bootsnippets.js	(.../bootsnippets.js)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
@@ -145,7 +145,7 @@
         '       <h3 class="card-title text-white">Card title</h3>' +
 		'    </div>' +
 		'    <div class="card-body">' +
-		'       <span class="pull-right" style="display:none;"><i class="fa fa-minus"></i></span>' +
+		'       <span class="float-end" style="display:none;"><i class="fa fa-minus"></i></span>' +
 		'       <div class="card-text">' +
 		'		  Card content' +
 		'       </div>' +
@@ -161,7 +161,7 @@
 			'       <h3 class="card-title text-white">' +
 			'         Card title' +
 			'		</h3>' +
-			'       <span class="pull-right" style="display:none;"><i class="fa fa-minus"></i></span>' +
+			'       <span class="float-end" style="display:none;"><i class="fa fa-minus"></i></span>' +
 			'    </div>' +
 			'    <div class="card-body">' +
 			'		<div class="card-text">' +
@@ -253,7 +253,7 @@
 		css: '',
 		html: 
 		'<div class="container">' +
-		'	<div class="col-xs-12 col-sm-9 col-sm-offset-1">' +
+		'	<div class="col-xs-12 col-sm-9 offset-sm-1">' +
 		'		<img class="img-fluid" style="margin: auto" src="/lams/www/public/ckeditor-templates/images/desk.jpg">' +
 		'		<div class="carousel-caption">' +
 		'			<h2>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut eleifend, turpis non luctus tempor</h2>' +