Index: lams_central/web/WEB-INF/tags/NotebookReedit.tag
===================================================================
diff -u -ra08fb689e1bb174869cb981d301b204d2f573590 -rc3888371ef51396eac033e0617292dc5a07af6aa
--- lams_central/web/WEB-INF/tags/NotebookReedit.tag	(.../NotebookReedit.tag)	(revision a08fb689e1bb174869cb981d301b204d2f573590)
+++ lams_central/web/WEB-INF/tags/NotebookReedit.tag	(.../NotebookReedit.tag)	(revision c3888371ef51396eac033e0617292dc5a07af6aa)
@@ -28,7 +28,7 @@
 	<c:set var="editNotebookLabelKey" value="label.edit" />
 </c:if>
 
-<div class="card shadow mt-4 mb-4">
+<div id="notebook-reedit" class="card shadow mt-4 mb-4">
 	<div class="card-header">
 		<fmt:message key="${notebookHeaderLabelKey}" />
 	</div>
@@ -53,7 +53,7 @@
 
 			<c:if test="${isEditButtonEnabled}">
 				<div class="mt-2 float-end">
-					<button name="editNotebookButton" id="edit-notebook-button" class="btn btn-sm btn-secondary btn-icon-pen" type="button"
+					<button name="editNotebookButton" id="edit-notebook-button" class="btn btn-sm btn-secondary btn-disable-on-submit btn-icon-pen" type="button"
 						onclick="continueReflect()">
 						<fmt:message key="${editNotebookLabelKey}" />
 					</button>
Index: lams_tool_nb/web/learnerContent.jsp
===================================================================
diff -u -r9f260ab21bfcc5fe47bd1238193fc34686fbd16d -rc3888371ef51396eac033e0617292dc5a07af6aa
--- lams_tool_nb/web/learnerContent.jsp	(.../learnerContent.jsp)	(revision 9f260ab21bfcc5fe47bd1238193fc34686fbd16d)
+++ lams_tool_nb/web/learnerContent.jsp	(.../learnerContent.jsp)	(revision c3888371ef51396eac033e0617292dc5a07af6aa)
@@ -22,7 +22,6 @@
         }
     </script>
 
-
     <p role="region">
         <c:out value="${nbLearnerForm.basicContent}" escapeXml="false" />
     </p>
@@ -32,44 +31,29 @@
         <form:hidden path="toolSessionID" />
 
         <c:if test="${userFinished and reflectOnActivity}">
-            <div class="card">
-                <div class="card-body">
-                    <p class="fst-italic">
-                        <lams:out value="${reflectInstructions}" escapeHtml="true" />
-                    </p>
-                    <p class="mt-5">
-                        <c:choose>
-                            <c:when test="${empty reflectEntry}">
-                                <fmt:message key="message.no.reflection.available" />
-                            </c:when>
-                            <c:otherwise>
-                                <lams:out escapeHtml="true" value="${reflectEntry}" />
-                            </c:otherwise>
-                        </c:choose>
-                    </p>
-                </div>
-            </div>
-
-
+			<lams:NotebookReedit
+				reflectInstructions="${reflectInstructions}"
+				reflectEntry="${reflectEntry}"
+				isEditButtonEnabled="false"
+				notebookHeaderLabelKey="titleHeading.reflection"/>
         </c:if>
 
         <c:if test="${allowComments}">
-            <hr/>
             <lams:Comments toolSessionId="${nbLearnerForm.toolSessionID}"
                            toolSignature="<%=NoticeboardConstants.TOOL_SIGNATURE%>" likeAndDislike="${likeAndDislike}"
-                           anonymous="${anonymous}" />
+                           anonymous="${anonymous}" bootstrap5="true"/>
         </c:if>
 
         <c:if test="${not nbLearnerForm.readOnly}">
             <div class="activity-bottom-buttons">
                 <c:choose>
                     <c:when test="${reflectOnActivity}">
-                        <button class="btn btn-primary" onclick="submitForm('reflect')">
+                        <button class="btn btn-primary na" onclick="submitForm('reflect')">
                             <fmt:message key="button.continue" />
                         </button>
                     </c:when>
                     <c:otherwise>
-                        <button id="finishButton" class="btn btn-primary">
+                        <button id="finishButton" class="btn btn-primary na">
                             <c:choose>
                                 <c:when test="${isLastActivity}">
                                     <fmt:message key="button.submit" />
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
diff -u -r572226a47e63b49ca60f35de579ec230feaa409a -rc3888371ef51396eac033e0617292dc5a07af6aa
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 572226a47e63b49ca60f35de579ec230feaa409a)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision c3888371ef51396eac033e0617292dc5a07af6aa)
@@ -253,47 +253,15 @@
 			</c:choose>
 		</div>
 
-		<!-- reflection -->
+		<!-- notebook reedit -->
+		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
+			<lams:NotebookReedit
+				reflectInstructions="${sessionMap.reflectInstructions}"
+				reflectEntry="${learner.reflectEntry}"
+				isEditButtonEnabled="${sessionMap.mode != 'teacher'}"
+				notebookHeaderLabelKey="title.reflection"/>
+		</c:if>
 
-		<div id="reflection">
-			<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
-				<div class="card shadow-sm mt-5">
-					<div class="card-header">
-						<fmt:message key="title.reflection" />
-					</div>
-					<div class="card-body">
-						<div class="m-2" aria-label="<fmt:message key='monitor.summary.td.notebookInstructions'/>">
-							<lams:out escapeHtml="true" value="${sessionMap.reflectInstructions}" />
-						</div>
-						<hr/>
-
-						<div class="m-2">
-							<c:choose>
-								<c:when test="${empty learner.reflect}">
-									<p>
-										<em> <fmt:message key="message.no.reflection.available" />
-										</em>
-									</p>
-								</c:when>
-								<c:otherwise>
-									<p>
-										<lams:out escapeHtml="true" value="${learner.reflect}" />
-									</p>
-								</c:otherwise>
-							</c:choose>
-						</div>
-
-						<c:if test="${sessionMap.mode != 'teacher'}">
-							<button id="notebookButton" name="notebookButton" style="margin-top: 10px" onclick="javascript:notebook();"
-									class="btn btn-sm btn-primary btn-disable-on-submit" >
-								<fmt:message key="label.edit" />
-							</button>
-						</c:if>
-					</div>
-				</div>
-			</c:if>
-		</div>
-
 		<!-- submit buttons -->
 		<div class="activity-bottom-buttons">
 			<c:if test="${sessionMap.mode != 'teacher'}">
@@ -342,22 +310,22 @@
 			}
 
 			<c:if test="${sessionMap.mode != 'author' and sessionMap.minLimitUploadNumber != null}">
-			var uploadedFilesNumber = +${learner.filesUploaded.size()};
-			if (uploadedFilesNumber >= ${sessionMap.minLimitUploadNumber}) {
-				$('.btn-hide-on-min-not-met').removeClass('btn-hide-on-min-not-met');
-			}
+				var uploadedFilesNumber = +${learner.filesUploaded.size()};
+				if (uploadedFilesNumber >= ${sessionMap.minLimitUploadNumber}) {
+					$('.btn-hide-on-min-not-met').removeClass('btn-hide-on-min-not-met');
+				}
 			</c:if>
 
 			<%-- Connect to command websocket only if it is learner UI --%>
 			<c:if test="${isLeadershipEnabled and sessionMap.mode == 'learner'}">
-			// command websocket stuff for refreshing
-			// trigger is an unique ID of page and action that command websocket code in Page.tag recognises
-			commandWebsocketHookTrigger = 'submit-files-leader-change-refresh-${sessionMap.toolSessionID}';
-			// if the trigger is recognised, the following action occurs
-			commandWebsocketHook = function() {
-				// in case in the address bar there is refresh.do, direct to the main learner URL
-				location.href = '<lams:WebAppURL />learning/learner.do?toolSessionID=${sessionMap.toolSessionID}';
-			};
+				// command websocket stuff for refreshing
+				// trigger is an unique ID of page and action that command websocket code in Page.tag recognises
+				commandWebsocketHookTrigger = 'submit-files-leader-change-refresh-${sessionMap.toolSessionID}';
+				// if the trigger is recognised, the following action occurs
+				commandWebsocketHook = function() {
+					// in case in the address bar there is refresh.do, direct to the main learner URL
+					location.href = '<lams:WebAppURL />learning/learner.do?toolSessionID=${sessionMap.toolSessionID}';
+				};
 			</c:if>
 		});