Index: lams_tool_nb/web/reflect.jsp
===================================================================
diff -u -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_tool_nb/web/reflect.jsp	(.../reflect.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
+++ lams_tool_nb/web/reflect.jsp	(.../reflect.jsp)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -1,62 +1,18 @@
 <!DOCTYPE html>
 <%@ include file="/includes/taglibs.jsp"%>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 <%@ page import="org.lamsfoundation.lams.tool.noticeboard.NoticeboardConstants"%>
 
-<lams:PageLearner toolSessionID="${nbLearnerForm.toolSessionID}" title="${nbLearnerForm.title}">
+<lams:Notebook title="${title}"
+	toolSessionID="${nbLearnerForm.toolSessionID}"
+	instructions="${reflectInstructions}"
+	formActionUrl="finish.do"
+	formModelAttribute="nbLearnerForm"
+	hiddenInputs="toolSessionID,mode"
+	notebookLabelKey="titleHeading.reflection"
+	isNextActivityButtonSupported="true"
+	isLastActivity="${isLastActivity}"
+	finishButtonLabelKey="button.submit"
+	nextActivityButtonLabelKey="button.finish"
+	isNbTool="true"/>
 
-	<script>
-		checkNextGateActivity('finishButton', '${nbLearnerForm.toolSessionID}', '', function () {
-			submitForm('finish');
-		});
-
-		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
-		}
-
-		function submitForm(methodName) {
-			var f = document.getElementById('nbLearnerForm');
-			f.action = methodName + ".do";
-			f.submit();
-		}
-
-		$(document).ready(function (){
-			$('#focusedInput').focus();
-		});
-	</script>
-
-	<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>
-
-		<div class="activity-bottom-buttons">
-			<button type="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>
-			</button>
-		</div>
-	</form:form>
-
-	<!-- Comments: the extra div counteracts the float -->
-	<c:if test="${allowComments}">
-		<div class="row no-gutter"><div class="col-xs-12"></div></div>
-		<lams:Comments toolSessionId="${nbLearnerForm.toolSessionID}"
-					   toolSignature="<%=NoticeboardConstants.TOOL_SIGNATURE%>" likeAndDislike="${likeAndDislike}" readOnly="true"
-					   pageSize="10" sortBy="1" />
-	</c:if>
-	<!-- End comments -->
-</lams:PageLearner>
\ No newline at end of file
