Index: lams_tool_sbmt/web/learner/definelater.jsp
===================================================================
diff -u -re2346bcbf640668c01dad29b3ccb2e34d10b4d85 -rc508d4130028a481087f0a08d6987713ab55239d
--- lams_tool_sbmt/web/learner/definelater.jsp	(.../definelater.jsp)	(revision e2346bcbf640668c01dad29b3ccb2e34d10b4d85)
+++ lams_tool_sbmt/web/learner/definelater.jsp	(.../definelater.jsp)	(revision c508d4130028a481087f0a08d6987713ab55239d)
@@ -4,15 +4,12 @@
 <fmt:message key='activity.title' var="title"/>
 <lams:PageLearner title="${title}" toolSessionID="${sessionMap.toolSessionID}" >
 
-	<div class="container-lg">
-		<div class="row justify-content-md-center">
-			  <div class="col-md-8">
-				<lams:DefineLater />
-			  </div>
-			</div>
-			
+	<div class="container-lg ">
+
+		<div class="d-flex justify-content-center">
+			<div class="p-2"><lams:DefineLater /></div>
 		</div>
-		
+
 	</div>
 
 </lams:PageLearner>
\ No newline at end of file
Index: lams_tool_sbmt/web/learner/notebook.jsp
===================================================================
diff -u -r13002c3db728527f219b3d1065b295168cb09a6b -rc508d4130028a481087f0a08d6987713ab55239d
--- lams_tool_sbmt/web/learner/notebook.jsp	(.../notebook.jsp)	(revision 13002c3db728527f219b3d1065b295168cb09a6b)
+++ lams_tool_sbmt/web/learner/notebook.jsp	(.../notebook.jsp)	(revision c508d4130028a481087f0a08d6987713ab55239d)
@@ -17,47 +17,41 @@
 	<div id="instructions" class="instructions">
 		<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true" />
 	</div>
-	<div class="row">
-		<div class="col-12 text-primary">
-			<hr class="mx-5">
-		</div>
-	</div>
+	<hr class="mx-5">
 	<form:form action="submitReflection.do" method="post" onsubmit="disableFinishButton();" modelAttribute="refForm" id="refForm">
 
 		<div class="container-lg">
-			<div class="row">
-				<div class="col-12">
 
-					<div class="card lcard lcard-no-borders shadow mb-3">
-						<div class="card-header lcard-header-button-border">
-							<fmt:message key="title.reflection" />
-						</div>
-						<div class="card-body mb-2">
-							<div class="form-group">
-								<form:hidden path="userID" />
-								<form:hidden path="sessionMapID" />
-								<form:textarea aria-label="${reflectionLabel}" aria-multiline="true" aria-required="true" required="true" path="entryText" cssClass="form-control" id="focused" rows="5"></form:textarea>
-							</div>
-						</div>
+			<div class="card lcard lcard-no-borders shadow mb-3">
+				<div class="card-header lcard-header-button-border">
+					<fmt:message key="title.reflection" />
+				</div>
+				<div class="card-body mb-2">
+					<div class="form-group">
+						<form:hidden path="userID" />
+						<form:hidden path="sessionMapID" />
+						<form:textarea aria-label="${reflectionLabel}" aria-multiline="true" aria-required="true" required="true" path="entryText" cssClass="form-control" id="focused" rows="5"></form:textarea>
 					</div>
 				</div>
 			</div>
-		</div>
 
-		<div class="activity-bottom-buttons">
-			<button class="btn btn-primary" 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>
+			<div class="activity-bottom-buttons">
+				<button class="btn btn-primary" id="finishButton">
 
-			</button>
+					<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>
 		</div>
+	
 	</form:form>
 
 </lams:PageLearner>
\ No newline at end of file
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
diff -u -r13002c3db728527f219b3d1065b295168cb09a6b -rc508d4130028a481087f0a08d6987713ab55239d
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 13002c3db728527f219b3d1065b295168cb09a6b)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision c508d4130028a481087f0a08d6987713ab55239d)
@@ -42,72 +42,71 @@
 	</div>
 
 	<div class="container-lg">
-		<div class="row">
-			<div class="col-12 text-primary">
-				<hr class="mx-5">
-				<!-- notices and announcements -->
-				<c:if test="${(sessionMap.mode == 'author' || sessionMap.mode == 'learner') && hasEditRight}">
-					<c:if test="${sessionMap.lockOnFinish} && ${sessionMap.userFinished}">
-						<!--  Lock when finished -->
-						<lams:Alert5 id="lockWhenFinished" type="info">
-							<fmt:message key="message.activityLocked" />
-						</lams:Alert5>
-					</c:if>
+		<hr class="mx-5 text-primary">
+		<div id="notices">
+		<!-- notices and announcements -->
+			<c:if test="${(sessionMap.mode == 'author' || sessionMap.mode == 'learner') && hasEditRight}">
+				<c:if test="${sessionMap.lockOnFinish} && ${sessionMap.userFinished}">
+					<!--  Lock when finished -->
+					<lams:Alert5 id="lockWhenFinished" type="info">
+						<fmt:message key="message.activityLocked" />
+					</lams:Alert5>
+				</c:if>
 
-					<c:if test="${not empty sessionMap.submissionDeadline}">
-						<lams:Alert5 id="submissionDeadline" type="warning" >
-							<fmt:message key="authoring.info.teacher.set.restriction">
-								<fmt:param>
-									<lams:Date value="${sessionMap.submissionDeadline}" />
-								</fmt:param>
-							</fmt:message>
-						</lams:Alert5>
-					</c:if>
+				<c:if test="${not empty sessionMap.submissionDeadline}">
+					<lams:Alert5 id="submissionDeadline" type="warning" >
+						<fmt:message key="authoring.info.teacher.set.restriction">
+							<fmt:param>
+								<lams:Date value="${sessionMap.submissionDeadline}" />
+							</fmt:param>
+						</fmt:message>
+					</lams:Alert5>
+				</c:if>
 
-					<c:if test="${not sessionMap.userFinished || not sessionMap.lockOnFinish}">
-						<c:choose>
-							<c:when test="${sessionMap.minLimitUploadNumber != null && sessionMap.isMaxLimitUploadEnabled}">
-								<c:set var="fileRestrictions">
-									<fmt:message key="label.learner.upload.restrictions"/>: 
-									<fmt:message key="label.should.upload.another">
-										<fmt:param value="${sessionMap.minLimitUploadNumber}" />
-									</fmt:message>&nbsp;<fmt:message key="label.learner.upload.restrictions.and"/>&nbsp;<fmt:message key="message.left.upload.limit">
-										<fmt:param value="${sessionMap.maxLimitUploadNumber}" />
-									</fmt:message>&nbsp;<fmt:message key="label.learner.upload.restrictions.files"/>
-								</c:set>
-							</c:when>
-							<c:when test="${sessionMap.minLimitUploadNumber != null}">
-								<c:set var="fileRestrictions">
-									<fmt:message key="label.learner.upload.restrictions"/>: 
-									<fmt:message key="label.should.upload.another">
-										<fmt:param value="${sessionMap.minLimitUploadNumber}" />
-									</fmt:message>&nbsp;<fmt:message key="label.learner.upload.restrictions.files"/>
-								</c:set>
-							</c:when>
-							<c:when test="${sessionMap.isMaxLimitUploadEnabled}">
-								<c:set var="fileRestrictions">
-									<fmt:message key="label.learner.upload.restrictions"/>: 
-									<fmt:message key="message.left.upload.limit">
-										<fmt:param value="${sessionMap.maxLimitUploadNumber}" />
-									</fmt:message>&nbsp;<fmt:message key="label.learner.upload.restrictions.files"/>
-								</c:set>
-							</c:when>						
-						</c:choose>
-						<c:if test="${not empty fileRestrictions}">
-							<lams:Alert5 id="minLimitUploadNumber" close="true" type="warning">
-								<c:out value="${fileRestrictions}" escapeXml="false" /> 
-							</lams:Alert5>	
-						</c:if>
-
+				<c:if test="${not sessionMap.userFinished || not sessionMap.lockOnFinish}">
+					<c:choose>
+						<c:when test="${sessionMap.minLimitUploadNumber != null && sessionMap.isMaxLimitUploadEnabled}">
+							<c:set var="fileRestrictions">
+								<fmt:message key="label.learner.upload.restrictions"/>: 
+								<fmt:message key="label.should.upload.another">
+									<fmt:param value="${sessionMap.minLimitUploadNumber}" />
+								</fmt:message>&nbsp;<fmt:message key="label.learner.upload.restrictions.and"/>&nbsp;<fmt:message key="message.left.upload.limit">
+									<fmt:param value="${sessionMap.maxLimitUploadNumber}" />
+								</fmt:message>&nbsp;<fmt:message key="label.learner.upload.restrictions.files"/>
+							</c:set>
+						</c:when>
+						<c:when test="${sessionMap.minLimitUploadNumber != null}">
+							<c:set var="fileRestrictions">
+								<fmt:message key="label.learner.upload.restrictions"/>: 
+								<fmt:message key="label.should.upload.another">
+									<fmt:param value="${sessionMap.minLimitUploadNumber}" />
+								</fmt:message>&nbsp;<fmt:message key="label.learner.upload.restrictions.files"/>
+							</c:set>
+						</c:when>
+						<c:when test="${sessionMap.isMaxLimitUploadEnabled}">
+							<c:set var="fileRestrictions">
+								<fmt:message key="label.learner.upload.restrictions"/>: 
+								<fmt:message key="message.left.upload.limit">
+									<fmt:param value="${sessionMap.maxLimitUploadNumber}" />
+								</fmt:message>&nbsp;<fmt:message key="label.learner.upload.restrictions.files"/>
+							</c:set>
+						</c:when>						
+					</c:choose>
+					<c:if test="${not empty fileRestrictions}">
+						<lams:Alert5 id="minLimitUploadNumber" close="true" type="warning">
+							<c:out value="${fileRestrictions}" escapeXml="false" /> 
+						</lams:Alert5>	
 					</c:if>
+
 				</c:if>
-				<lams:errors5/>
+			</c:if>
+		</div>
 
-			</div>
+		<div id="errors">
+			<lams:errors5/>
 		</div>
 
-		<div class="row">
-			<div class="col-12">
+		<div id="uploader">
 			<!-- upload form (we display it only if the user is not finished and lockedWhenFinished or no more files allowed) -->
 			<c:if test="${!sessionMap.finishLock && !sessionMap.maxLimitReached && hasEditRight && sessionMap.mode != 'teacher'}">
 				<form:form action="uploadFile.do" modelAttribute="learnerForm" id="learnerForm" method="post" enctype="multipart/form-data" onsubmit="return validateFileUpload();" >
@@ -160,12 +159,12 @@
 				<hr/>
 			</c:if>
 			<!-- end div uppy form-->
-			</div>
 		</div>
 
 
 
 		<!--Checks if the filesUploaded property of the SbmtLearnerForm is set -->
+		<div id="submittedFiles">
 		<c:choose>
 			<c:when test="${empty learner.filesUploaded && hasEditRight}">
 				<div class="alert">
@@ -174,7 +173,7 @@
 			</c:when>
 
 			<c:otherwise>
-				<h4 id="submittedFiles" class="mt-5">
+				<h4 class="mt-5">
 					<fmt:message key="monitoring.user.submittedFiles" />
 				</h4>
 				<small class="text-muted"><c:out value="${fn:length(learner.filesUploaded)}" />&nbsp;<fmt:message key="label.files" /></small>
@@ -191,17 +190,18 @@
 									<i class="fa-regular fa-file" aria-label="false"></i> &nbsp;<a class="fw-bold" href="${downloadURL}" aria-label="<fmt:message key="label.download" />"><c:out value="${file.filePath}" /></a>
 									<div class="float-end">
 										<c:if test="${empty file.marks && hasEditRight}">
-											<a href="javascript:deleteLearnerFile(${file.submissionID}, '${file.filePath}');" class="btn btn-primary btn-disable-on-submit">
+											<a href="javascript:deleteLearnerFile(${file.submissionID}, '${file.filePath}');" class="btn btn-primary btn-disable-on-submit" 
+											title="<fmt:message key="label.monitoring.original.learner.file.delete"/>">
 												<i class="fa fa-trash" aria-label="<fmt:message key="label.monitoring.original.learner.file.delete"/>"></i>
 											</a>
 										</c:if>
 
-										<a href="${downloadURL}"  class="btn btn-primary btn-disable-on-submit ">
-											<i class="fa fa-download" title="<fmt:message key="label.download" />" aria-label="<fmt:message key="label.download" />"></i>
+										<a href="${downloadURL}"  class="btn btn-primary btn-disable-on-submit " title="<fmt:message key="label.download" />" >
+											<i class="fa fa-download" aria-label="<fmt:message key="label.download" />"></i>
 										</a>
 									</div>
 									<br>
-									<small class="text-muted">
+									<small>
 										<fmt:message key="label.learner.time" />&nbsp;<lams:Date value="${file.dateOfSubmission}" timeago="true"/>									
 									</small>
 								</div>
@@ -254,11 +254,13 @@
 
 			</c:otherwise>
 		</c:choose>
+		</div>
 
 		<!-- reflection -->
 
+		<div id="reflection">
 		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
-			<div class="card shadow-sm">
+			<div class="card shadow-sm mt-5">
 				<div class="card-header">
 					<fmt:message key="title.reflection" />
 				</div>
@@ -293,6 +295,7 @@
 				</div>
 			</div>
 		</c:if>
+		</div>
 
 		<!-- submit buttons -->
 		<div class="activity-bottom-buttons">
Index: lams_tool_sbmt/web/learner/submissionDeadline.jsp
===================================================================
diff -u -r13002c3db728527f219b3d1065b295168cb09a6b -rc508d4130028a481087f0a08d6987713ab55239d
--- lams_tool_sbmt/web/learner/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 13002c3db728527f219b3d1065b295168cb09a6b)
+++ lams_tool_sbmt/web/learner/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision c508d4130028a481087f0a08d6987713ab55239d)
@@ -51,5 +51,4 @@
 	</div>
 
 
-
 </lams:PageLearner>
Index: lams_tool_sbmt/web/learner/waitforleader.jsp
===================================================================
diff -u -re2346bcbf640668c01dad29b3ccb2e34d10b4d85 -rc508d4130028a481087f0a08d6987713ab55239d
--- lams_tool_sbmt/web/learner/waitforleader.jsp	(.../waitforleader.jsp)	(revision e2346bcbf640668c01dad29b3ccb2e34d10b4d85)
+++ lams_tool_sbmt/web/learner/waitforleader.jsp	(.../waitforleader.jsp)	(revision c508d4130028a481087f0a08d6987713ab55239d)
@@ -8,46 +8,40 @@
 	<div id="instructions" class="instructions">
 		<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true" />
 	</div>
-	<div class="row">
-		<div class="col-12 text-primary">
-			<hr class="mx-5">
-		</div>
-	</div>
+	<hr class="mx-5">
 	<div class="container-lg">
-		<div class="row">
-			<div class="col-12">
-				<div class="card lcard lcard-no-borders shadow mb-3">
-					<div class="card-header lcard-header-button-border">
-						<fmt:message key="${waitingMessageKey}" />
+
+		<div class="card lcard lcard-no-borders shadow mb-3">
+			<div class="card-header lcard-header-button-border">
+				<fmt:message key="${waitingMessageKey}" />
+			</div>
+			<div class="card-body mb-3">
+				<c:if test="${not empty groupUsers}">
+
+					<div class="mb-2">
+						<fmt:message key="label.users.from.group" />
 					</div>
-					<div class="card-body mb-3">
-						<c:if test="${not empty groupUsers}">
-		
-							<div class="mb-2">
-								<fmt:message key="label.users.from.group" />
+					
+					<div id="usersInGroup" class="row mt-2" role="list">
+						<c:forEach var="user" items="${groupUsers}">
+							<div role="listitem" class="col-md-4 my-2 text-md-start">
+								<lams:Portrait userId="${user.userID}"/>
+								<span>
+									<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+								</span>
 							</div>
-							
-							<div id="usersInGroup" class="row mt-2" role="list">
-								<c:forEach var="user" items="${groupUsers}">
-									<div role="listitem" class="col-md-4 my-2 text-md-start">
-										<lams:Portrait userId="${user.userID}"/>
-										<span>
-											<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
-										</span>
-									</div>
-								</c:forEach>
-							</div>
-							
-						</c:if>
+						</c:forEach>
 					</div>
-				</div>
-				<div class="activity-bottom-buttons">
-					<button id="finishButton" name="refreshButton" onclick="refresh();" class="btn btn-primary">
-						<fmt:message key="label.refresh" />
-					</button>
-				</div>
+					
+				</c:if>
 			</div>
 		</div>
+		<div class="activity-bottom-buttons">
+			<button id="finishButton" name="refreshButton" onclick="refresh();" class="btn btn-primary">
+				<fmt:message key="label.refresh" />
+			</button>
+		</div>
+
 	</div>				
 	<script type="text/javascript">
 		function refresh() {