Index: lams_central/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u -r572226a47e63b49ca60f35de579ec230feaa409a -r276688ca59a2a6e096772e48d31830c53bf7bd65
--- lams_central/web/WEB-INF/tags/WaitForLeader.tag	(.../WaitForLeader.tag)	(revision 572226a47e63b49ca60f35de579ec230feaa409a)
+++ lams_central/web/WEB-INF/tags/WaitForLeader.tag	(.../WaitForLeader.tag)	(revision 276688ca59a2a6e096772e48d31830c53bf7bd65)
@@ -12,7 +12,7 @@
 
 <%-- Default value for I18N keys --%>
 <c:if test="${empty isUserIdPropertyCapitalized}">
-	//org.lamsfoundation.lams.usermanagement.User has non-capitalized userId property
+	<%--org.lamsfoundation.lams.usermanagement.User has non-capitalized userId property--%>
 	<c:set var="isUserIdPropertyCapitalized" value="false" />
 </c:if> 
 <c:if test="${empty refreshKey}">
Index: lams_central/web/css/jquery.minicolors.css
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r276688ca59a2a6e096772e48d31830c53bf7bd65
--- lams_central/web/css/jquery.minicolors.css	(.../jquery.minicolors.css)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/css/jquery.minicolors.css	(.../jquery.minicolors.css)	(revision 276688ca59a2a6e096772e48d31830c53bf7bd65)
@@ -260,7 +260,7 @@
 /* Bootstrap theme */
 .minicolors-theme-bootstrap .minicolors-swatch {
   z-index: 2;
-  top: 3px;
+  top: 2px;
   left: 3px;
   width: 28px;
   height: 28px;
Index: lams_tool_assessment/web/pages/learning/waitForLeaderTimeLimit.jsp
===================================================================
diff -u -r572226a47e63b49ca60f35de579ec230feaa409a -r276688ca59a2a6e096772e48d31830c53bf7bd65
--- lams_tool_assessment/web/pages/learning/waitForLeaderTimeLimit.jsp	(.../waitForLeaderTimeLimit.jsp)	(revision 572226a47e63b49ca60f35de579ec230feaa409a)
+++ lams_tool_assessment/web/pages/learning/waitForLeaderTimeLimit.jsp	(.../waitForLeaderTimeLimit.jsp)	(revision 276688ca59a2a6e096772e48d31830c53bf7bd65)
@@ -18,7 +18,7 @@
 		</lams:Alert5>
 
 		<div class="activity-bottom-buttons">
-			<button id="refresh-button" name="refreshButton" onclick="refresh();" class="btn btn-primary btn-icon-refresh">
+			<button type="button" id="refresh-button" name="refreshButton" onclick="refresh();" class="btn btn-primary btn-icon-refresh">
 				<fmt:message key="label.refresh" />
 			</button>
 		</div>
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
diff -u -r06770d77acb444693664d588e5d2e8570adb96aa -r276688ca59a2a6e096772e48d31830c53bf7bd65
--- lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 06770d77acb444693664d588e5d2e8570adb96aa)
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 276688ca59a2a6e096772e48d31830c53bf7bd65)
@@ -290,12 +290,12 @@
 		</div>
 
 		<!-- Resources to View -->
-		<div class="card-subheader">
+		<div class="card-subheader mb-3">
 			<fmt:message key="label.resoruce.to.review" />
 		</div>
 
 		<c:forEach var="item" items="${sessionMap.resourceList}">
-			<div class="item-card card lcard" >
+			<div class="item-card card lcard">
 				<div class="card-header" id="heading${item.uid}">
 			        	<span class="card-title collapsable-icon-left">
 				        	<button type="button" class="btn btn-secondary-darker no-shadow collapsed" data-bs-toggle="collapse" data-bs-target="#collapse${item.uid}"
@@ -337,44 +337,6 @@
 			</div>
 		</c:forEach>
 
-		<!--  Card button bar controlling refresh and adding items -->
-		<div class="btn-group float-end my-3">
-			<c:if test="${mode != 'teacher'}">
-				<button onclick="javascript:return checkNew()" type="button" class="btn btn-secondary"> 
-					<i class="fa fa-refresh"></i> 
-					<fmt:message key="label.check.for.new" />
-				</button>
-			</c:if>
-			<c:if test="${not finishedLock}">
-				<c:choose>
-					<c:when test="${resource.allowAddFiles && resource.allowAddUrls}">
-						<button onclick="javascript:gotoURL()" type="button" class="btn btn-secondary"> 
-							<i class="fa fa-plus"></i>
-							<fmt:message key="label.authoring.basic.resource.url.input" />
-						</button>
-						<button onclick="javascript:gotoFile()" type="button" class="btn btn-secondary"> 
-							<i class="fa fa-plus"></i>
-							<fmt:message key="label.authoring.basic.resource.file.input" />
-						</button>
-					</c:when>
-
-					<c:when test="${resource.allowAddFiles && !resource.allowAddUrls}">
-						<button onclick="javascript:gotoFile()" type="button" class="btn btn-secondary"> 
-							<i class="fa fa-plus"></i>
-							<fmt:message key="label.authoring.basic.resource.file.input" />
-						</button>
-					</c:when>
-
-					<c:when test="${!resource.allowAddFiles && resource.allowAddUrls}">
-						<button onclick="javascript:gotoURL()" type="button" class="btn btn-secondary"> 
-							<i class="fa fa-plus"></i>
-							<fmt:message key="label.authoring.basic.resource.url.input" />
-						</button>
-					</c:when>
-				</c:choose>
-			</c:if>
-		</div>
-
 		<!-- Add a URL/File Form-->
 		<div id="addresource">
 		</div>
@@ -388,9 +350,10 @@
 				notebookHeaderLabelKey="title.reflection"/>
 		</c:if>
 		
-		<!-- Finish buttons -->
-		<c:if test="${mode != 'teacher' && sessionMap.hasCompletedMinNumber}">
-			<div class="activity-bottom-buttons">
+		<div class="activity-bottom-buttons mt-5">
+		
+			<!-- Finish buttons -->
+			<c:if test="${mode != 'teacher' && sessionMap.hasCompletedMinNumber}">
 				<c:choose>
 					<c:when test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
 						<button type="button" name="FinishButton" onclick="return continueReflect()" class="btn btn-primary na btn-disable-on-submit">
@@ -399,7 +362,6 @@
 					</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}">
 										<fmt:message key="label.submit" />
@@ -408,12 +370,49 @@
 										<fmt:message key="label.finished" />
 									</c:otherwise>
 								</c:choose>
-							</span>
 						</button>
 					</c:otherwise>
 				</c:choose>
+			</c:if>			
+
+			<!--  Card button bar controlling refresh and adding items -->
+			<div class="btn-group mx-2">
+				<c:if test="${mode != 'teacher'}">
+					<button onclick="javascript:return checkNew()" type="button" class="btn btn-secondary"> 
+						<i class="fa fa-refresh"></i> 
+						<fmt:message key="label.check.for.new" />
+					</button>
+				</c:if>
+				<c:if test="${not finishedLock}">
+					<c:choose>
+						<c:when test="${resource.allowAddFiles && resource.allowAddUrls}">
+							<button onclick="javascript:gotoURL()" type="button" class="btn btn-secondary"> 
+								<i class="fa fa-plus"></i>
+								<fmt:message key="label.authoring.basic.resource.url.input" />
+							</button>
+							<button onclick="javascript:gotoFile()" type="button" class="btn btn-secondary"> 
+								<i class="fa fa-plus"></i>
+								<fmt:message key="label.authoring.basic.resource.file.input" />
+							</button>
+						</c:when>
+	
+						<c:when test="${resource.allowAddFiles && !resource.allowAddUrls}">
+							<button onclick="javascript:gotoFile()" type="button" class="btn btn-secondary"> 
+								<i class="fa fa-plus"></i>
+								<fmt:message key="label.authoring.basic.resource.file.input" />
+							</button>
+						</c:when>
+	
+						<c:when test="${!resource.allowAddFiles && resource.allowAddUrls}">
+							<button onclick="javascript:gotoURL()" type="button" class="btn btn-secondary"> 
+								<i class="fa fa-plus"></i>
+								<fmt:message key="label.authoring.basic.resource.url.input" />
+							</button>
+						</c:when>
+					</c:choose>
+				</c:if>
 			</div>
-		</c:if>
+		</div>
 
 	</div>
 </lams:PageLearner>
Index: lams_tool_larsrc/web/pages/learning/success.jsp
===================================================================
diff -u -r06770d77acb444693664d588e5d2e8570adb96aa -r276688ca59a2a6e096772e48d31830c53bf7bd65
--- lams_tool_larsrc/web/pages/learning/success.jsp	(.../success.jsp)	(revision 06770d77acb444693664d588e5d2e8570adb96aa)
+++ lams_tool_larsrc/web/pages/learning/success.jsp	(.../success.jsp)	(revision 276688ca59a2a6e096772e48d31830c53bf7bd65)
@@ -11,7 +11,7 @@
  		document.location.href = '<c:url value="/learning/start.do"/>?mode=${mode}&toolSessionID=${toolSessionID}&reqID='+reqIDVar.getTime();	
  	</script>
  	
-	<div style="align:center">
+	<div id="container-main text-center">
 		<!--  Should never be seen -->
 		<a href="<c:url value="/learning/start.do"/>?mode=${mode}&toolSessionID=${toolSessionID}" type="button" class="btn btn-primary">
 			<i class="fa fa-xm fa-refresh"></i> <fmt:message key="label.check.for.new" />
Index: lams_tool_mindmap/web/pages/learning/galleryWalk.jsp
===================================================================
diff -u -rba4898999f40be22618e9225a8d02361cf7c4a0f -r276688ca59a2a6e096772e48d31830c53bf7bd65
--- lams_tool_mindmap/web/pages/learning/galleryWalk.jsp	(.../galleryWalk.jsp)	(revision ba4898999f40be22618e9225a8d02361cf7c4a0f)
+++ lams_tool_mindmap/web/pages/learning/galleryWalk.jsp	(.../galleryWalk.jsp)	(revision 276688ca59a2a6e096772e48d31830c53bf7bd65)
@@ -91,12 +91,12 @@
 	</div>
 
 	<c:if test="${mindmapDTO.galleryWalkFinished and not mindmapDTO.galleryWalkReadOnly}">
-		<div class="text-center my-3 card-subheader">
+		<div class="text-center card-subheader my-3">
 			<fmt:message key="label.gallery.walk.ratings.header" />
 		</div>
 		
 		<div id="gallery-walk-rating-table" class="ltable table-sm">
-			<div class="row table-lightx">
+			<div class="row">
 		    	<div class="col"><fmt:message key="monitoring.label.group" /></div>
 		    	<div class="col text-center"><fmt:message key="label.rating" /></div>
 			</div>
@@ -116,7 +116,7 @@
 		</div>
 	</c:if>
 	
-	<div class="text-center my-3 card-subheader">
+	<div class="text-center card-subheader my-3">
 		<fmt:message key="label.gallery.walk" />
 	</div>
 	
@@ -145,7 +145,7 @@
 			</span>
 	       </div>
 	       
-	       <div id="collapse${mindmapSession.sessionID}" class="card-body panel-collapse collapse mindmap-collapse" 
+	       <div id="collapse${mindmapSession.sessionID}" class="card-body collapse mindmap-collapse" 
 	       	    aria-labelledby="heading${mindmapSession.sessionID}">
 				<%-- Do not show rating to own group before Gallery Walk is finished --%>
 	       	    <c:if test="${not mindmapDTO.galleryWalkReadOnly and (mindmapDTO.galleryWalkFinished or mode == 'teacher' or toolSessionID != mindmapSession.sessionID)}">
@@ -191,14 +191,14 @@
 				
 				<c:otherwise>
 					<button type="button" name="FinishButton" id="finish-button" 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.finish" />
-			 					</c:otherwise>
-			 				</c:choose>
+						<c:choose>
+			 				<c:when test="${sessionMap.isLastActivity}">
+			 					<fmt:message key="button.submit" />
+			 				</c:when>
+			 				<c:otherwise>
+			 		 			<fmt:message key="button.finish" />
+			 				</c:otherwise>
+			 			</c:choose>
 					</button>
 				</c:otherwise>
 			</c:choose>