Index: lams_admin/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u
--- lams_admin/web/WEB-INF/tags/Notebook.tag	(revision 0)
+++ lams_admin/web/WEB-INF/tags/Notebook.tag	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -0,0 +1,108 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="instructions" required="true" rtexprvalue="true"%>
+<%@ attribute name="formActionUrl" required="true" rtexprvalue="true"%>
+<%@ attribute name="formModelAttribute" required="false" rtexprvalue="true"%>
+<c:if test="${empty formModelAttribute}">
+	<c:set var="formModelAttribute" value="reflectionForm" />
+</c:if>
+<%@ attribute name="isNextActivityButtonSupported" required="true" rtexprvalue="true"%>
+<%@ attribute name="isLastActivity" required="false" rtexprvalue="true"%>
+<%@ attribute name="hiddenInputs" required="false" rtexprvalue="true"%>
+<c:if test="${empty hiddenInputs}">
+	<c:set var="hiddenInputs" value="userID,sessionMapID" />
+</c:if>
+<%@ attribute name="isNbTool" required="false" rtexprvalue="true"%>
+<c:if test="${empty isNbTool}">
+	<c:set var="isNbTool" value="false" />
+</c:if>
+
+<%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
+<%-- Default value for I18N keys --%> 
+<c:if test="${empty notebookLabelKey}">
+	<c:set var="notebookLabelKey" value="label.notebook" />
+</c:if>
+<c:if test="${empty finishButtonLabelKey}">
+	<c:set var="finishButtonLabelKey" value="label.submit" />
+</c:if>
+<c:if test="${empty nextActivityButtonLabelKey}">
+	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+</c:if>
+
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
+		}
+		function submitForm() {
+			var f = document.getElementById('reflectionForm');
+			f.submit();
+		}
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+	
+	<div id="instructions" class="instructions">
+		<lams:out value="${instructions}" escapeHtml="true" />
+	</div>
+	<hr class="mx-5">
+
+	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
+			<form:hidden path="${hiddenInput}" />
+		</c:forTokens>	
+			
+		<lams:errors5/>
+		
+		<div class="container-lg">
+			<div class="card lcard lcard-no-borders shadow mb-3">
+				<div class="card-header lcard-header-button-border">
+					<fmt:message key="${notebookLabelKey}" />
+				</div>
+				<div class="card-body mb-3">
+					<fmt:message key="${notebookLabelKey}" var="notebookLabel"/>
+					<form:textarea aria-label="${notebookLabel}" aria-multiline="true"
+						aria-required="true" required="true" path="entryText"
+						cssClass="form-control" id="focused" rows="5"></form:textarea>
+				</div>
+			</div>
+	
+			<div class="activity-bottom-buttons">
+				<button name="finishButton" id="finishButton" class="btn btn-primary">
+					<c:choose>
+						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
+							<fmt:message key="${finishButtonLabelKey}" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="${nextActivityButtonLabelKey}" />
+						</c:otherwise>
+					</c:choose>
+				</buttun>
+			</div>
+		
+		</div>
+	</form:form>
+	
+	<c:if test="${isNbTool}">
+		<!-- 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="${toolSessionID}"
+						   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
+						   pageSize="10" sortBy="1" />
+		</c:if>
+		<!-- End comments -->
+	</c:if>
+
+</lams:PageLearner>
\ No newline at end of file
Index: lams_admin/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r14a43ff0db3bd18db9a56dde9555420f04347c47 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_admin/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
+++ lams_admin/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -16,161 +16,123 @@
    </listener>
 
    <tag>
-
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
       <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
       <name>WebAppURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
       </icon>
       <name>help</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Help tag</description>
          <name>module</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>toolSignature</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>page</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>style</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
       </icon>
       <name>Configuration</name>
       <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Get the configuration value for the specified key</description>
          <name>key</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
       <name>LAMSURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
       </icon>
       <name>html</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
          <description>Render html tag with direction and language</description>
          <name>xhtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
       <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
       <name>out</name>
       <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>value</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>escapeHtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts role name into form usable as message resources key</description>
       <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
       <name>role</name>
       <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts role name into form usable as message resources key</description>
          <name>role</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -192,7 +154,6 @@
  	  </attribute>
    </tag>
    <tag>
-
       <description>Output details from the shared session UserDTO object</description>
       <display-name>user details</display-name>
       <icon>    
@@ -205,14 +166,9 @@
          <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
-
-	
 	<tag>
       <description>Small portrait of a user</description>
       <display-name>User Portrait</display-name>
@@ -243,32 +199,61 @@
          <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
       </attribute>
    </tag>
-	
-	<tag-file>
-       <name>Tab</name>
-       <path>/WEB-INF/tags/Tab.tag</path>
-   	</tag-file>
+   <tag>
+	    <name>textarea</name>
+	    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
+	    <body-content>JSP</body-content>
+	    <dynamic-attributes>true</dynamic-attributes>
+	    <description>
+	    	Render text exactly same as  original input, which even won't escape the input HTML tag.
+	    </description>    
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>name</name>
+	        <required>true</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>id</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>onchange</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>disabled</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+  	</tag>
+  	
    	<tag-file>
-       <name>Tabs</name>
-       <path>/WEB-INF/tags/Tabs.tag</path>
-   	</tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+   	</tag-file> 
    	<tag-file>
-       <name>TabBody</name>
-       <path>/WEB-INF/tags/TabBody.tag</path>
-   	</tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
    	<tag-file>
-       <name>TabBodys</name>
-       <path>/WEB-INF/tags/TabBodys.tag</path>
+	    <name>Alert5</name>
+		<path>/WEB-INF/tags/Alert5.tag</path>
+   	</tag-file> 
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>TabBodyArea</name>
-       <path>/WEB-INF/tags/TabBodyArea.tag</path>
-   	</tag-file>
-   	<tag-file>
-       <name>CKEditor</name>
-       <path>/WEB-INF/tags/CKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   
@@ -281,86 +266,82 @@
        <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Rating</name>
-       <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>    		
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>StyledRating</name>
-       <path>/WEB-INF/tags/StyledRating.tag</path>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>headItems</name>
-       <path>/WEB-INF/tags/headItems.tag</path>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
-   	</tag-file>  
+   	</tag-file> 
    	<tag-file>
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Alert</name>
-		<path>/WEB-INF/tags/Alert.tag</path>
-   	</tag-file>  
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Page</name>
-		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>
+	    <name>errors</name>
+		<path>/WEB-INF/tags/Errors.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>TSTable</name>
-		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>    
-  	<tag-file>
-	    <name>Arrow</name>
-		<path>/WEB-INF/tags/Arrow.tag</path>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>AdvancedAccordian</name>
-       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
-   	</tag-file>  
-   	<tag-file>
-   		<name>RestrictedUsageAccordian</name>
-   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
    	</tag-file>
-  	<tag-file>
-	    <name>SimplePanel</name>
-		<path>/WEB-INF/tags/SimplePanel.tag</path>
-   	</tag-file>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>
    	<tag-file>
+       <name>headItems</name>
+       <path>/WEB-INF/tags/headItems.tag</path>
+   	</tag-file> 
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TextSearch</name>
-		<path>/WEB-INF/tags/TextSearch.tag</path>
-   	</tag-file>  
+       <name>Input</name>
+       <path>/WEB-INF/tags/Input.tag</path>
+   	</tag-file>
    	<tag-file>
+       <name>JSImport</name>
+       <path>/WEB-INF/tags/JSImport.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Notebook</name>
+		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file> 
    	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag-file>
-       <name>Etherpad</name>
-       <path>/WEB-INF/tags/Etherpad.tag</path>
-   	</tag-file> 
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
    	<tag-file>
-	    <name>errors</name>
-		<path>/WEB-INF/tags/Errors.tag</path>
-   	</tag-file> 
-   	<tag-file>
-	    <name>errors5</name>
-		<path>/WEB-INF/tags/Errors5.tag</path>
-   	</tag-file>    
-   	<tag-file>
-	    <name>Widget</name>
-		<path>/WEB-INF/tags/Widget.tag</path>
-   	</tag-file>   
-   	<tag-file>
 	    <name>Page5</name>
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
@@ -369,92 +350,71 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TSTable5</name>
-		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>  
+       <name>Popover</name>
+       <path>/WEB-INF/tags/Popover.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>WaitForLeader</name>
-		<path>/WEB-INF/tags/WaitForLeader.tag</path>
-   	</tag-file>  
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Alert5</name>
-		<path>/WEB-INF/tags/Alert5.tag</path>
-   	</tag-file>  
-   	<tag-file>
-       <name>FileUpload5</name>
-       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
-   	<tag>
-    <name>textarea</name>
-    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
-    <body-content>JSP</body-content>
-    <dynamic-attributes>true</dynamic-attributes>
-    <description>
-    	Render text exactly same as  original input, which even won't escape the input HTML tag.
-    </description>    
-    <attribute>
-        <description>
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>id</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>onchange</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>disabled</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-	<tag-file>
-		<name>head</name>
-	    <path>/WEB-INF/tags/Head.tag</path>
-	</tag-file>
-   	<tag-file>
-       <name>Comments</name>
-       <path>/WEB-INF/tags/Comments.tag</path>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>CommentsAuthor</name>
-       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
+   	</tag-file>    		
+   	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FileUpload</name>
-       <path>/WEB-INF/tags/FileUpload.tag</path>
+       <name>Switch</name>
+       <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>WaitingSpinner</name>
-       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>JSImport</name>
-       <path>/WEB-INF/tags/JSImport.tag</path>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Popover</name>
-       <path>/WEB-INF/tags/Popover.tag</path>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Input</name>
-       <path>/WEB-INF/tags/Input.tag</path>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Switch</name>
-       <path>/WEB-INF/tags/Switch.tag</path>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>TSTable5</name>
+		<path>/WEB-INF/tags/TSTable5.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
    	</tag-file>
+	<tag-file>
+	    <name>Widget</name>
+		<path>/WEB-INF/tags/Widget.tag</path>
+   	</tag-file> 
 </taglib>
\ No newline at end of file
Index: lams_central/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u
--- lams_central/web/WEB-INF/tags/Notebook.tag	(revision 0)
+++ lams_central/web/WEB-INF/tags/Notebook.tag	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -0,0 +1,108 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="instructions" required="true" rtexprvalue="true"%>
+<%@ attribute name="formActionUrl" required="true" rtexprvalue="true"%>
+<%@ attribute name="formModelAttribute" required="false" rtexprvalue="true"%>
+<c:if test="${empty formModelAttribute}">
+	<c:set var="formModelAttribute" value="reflectionForm" />
+</c:if>
+<%@ attribute name="isNextActivityButtonSupported" required="true" rtexprvalue="true"%>
+<%@ attribute name="isLastActivity" required="false" rtexprvalue="true"%>
+<%@ attribute name="hiddenInputs" required="false" rtexprvalue="true"%>
+<c:if test="${empty hiddenInputs}">
+	<c:set var="hiddenInputs" value="userID,sessionMapID" />
+</c:if>
+<%@ attribute name="isNbTool" required="false" rtexprvalue="true"%>
+<c:if test="${empty isNbTool}">
+	<c:set var="isNbTool" value="false" />
+</c:if>
+
+<%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
+<%-- Default value for I18N keys --%> 
+<c:if test="${empty notebookLabelKey}">
+	<c:set var="notebookLabelKey" value="label.notebook" />
+</c:if>
+<c:if test="${empty finishButtonLabelKey}">
+	<c:set var="finishButtonLabelKey" value="label.submit" />
+</c:if>
+<c:if test="${empty nextActivityButtonLabelKey}">
+	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+</c:if>
+
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
+		}
+		function submitForm() {
+			var f = document.getElementById('reflectionForm');
+			f.submit();
+		}
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+	
+	<div id="instructions" class="instructions">
+		<lams:out value="${instructions}" escapeHtml="true" />
+	</div>
+	<hr class="mx-5">
+
+	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
+			<form:hidden path="${hiddenInput}" />
+		</c:forTokens>	
+			
+		<lams:errors5/>
+		
+		<div class="container-lg">
+			<div class="card lcard lcard-no-borders shadow mb-3">
+				<div class="card-header lcard-header-button-border">
+					<fmt:message key="${notebookLabelKey}" />
+				</div>
+				<div class="card-body mb-3">
+					<fmt:message key="${notebookLabelKey}" var="notebookLabel"/>
+					<form:textarea aria-label="${notebookLabel}" aria-multiline="true"
+						aria-required="true" required="true" path="entryText"
+						cssClass="form-control" id="focused" rows="5"></form:textarea>
+				</div>
+			</div>
+	
+			<div class="activity-bottom-buttons">
+				<button name="finishButton" id="finishButton" class="btn btn-primary">
+					<c:choose>
+						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
+							<fmt:message key="${finishButtonLabelKey}" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="${nextActivityButtonLabelKey}" />
+						</c:otherwise>
+					</c:choose>
+				</buttun>
+			</div>
+		
+		</div>
+	</form:form>
+	
+	<c:if test="${isNbTool}">
+		<!-- 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="${toolSessionID}"
+						   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
+						   pageSize="10" sortBy="1" />
+		</c:if>
+		<!-- End comments -->
+	</c:if>
+
+</lams:PageLearner>
\ No newline at end of file
Index: lams_central/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r14a43ff0db3bd18db9a56dde9555420f04347c47 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_central/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
+++ lams_central/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -16,161 +16,123 @@
    </listener>
 
    <tag>
-
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
       <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
       <name>WebAppURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
       </icon>
       <name>help</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Help tag</description>
          <name>module</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>toolSignature</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>page</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>style</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
       </icon>
       <name>Configuration</name>
       <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Get the configuration value for the specified key</description>
          <name>key</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
       <name>LAMSURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
       </icon>
       <name>html</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
          <description>Render html tag with direction and language</description>
          <name>xhtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
       <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
       <name>out</name>
       <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>value</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>escapeHtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts role name into form usable as message resources key</description>
       <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
       <name>role</name>
       <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts role name into form usable as message resources key</description>
          <name>role</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -192,7 +154,6 @@
  	  </attribute>
    </tag>
    <tag>
-
       <description>Output details from the shared session UserDTO object</description>
       <display-name>user details</display-name>
       <icon>    
@@ -205,14 +166,9 @@
          <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
-
-	
 	<tag>
       <description>Small portrait of a user</description>
       <display-name>User Portrait</display-name>
@@ -243,32 +199,61 @@
          <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
       </attribute>
    </tag>
-	
-	<tag-file>
-       <name>Tab</name>
-       <path>/WEB-INF/tags/Tab.tag</path>
-   	</tag-file>
+   <tag>
+	    <name>textarea</name>
+	    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
+	    <body-content>JSP</body-content>
+	    <dynamic-attributes>true</dynamic-attributes>
+	    <description>
+	    	Render text exactly same as  original input, which even won't escape the input HTML tag.
+	    </description>    
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>name</name>
+	        <required>true</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>id</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>onchange</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>disabled</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+  	</tag>
+  	
    	<tag-file>
-       <name>Tabs</name>
-       <path>/WEB-INF/tags/Tabs.tag</path>
-   	</tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+   	</tag-file> 
    	<tag-file>
-       <name>TabBody</name>
-       <path>/WEB-INF/tags/TabBody.tag</path>
-   	</tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
    	<tag-file>
-       <name>TabBodys</name>
-       <path>/WEB-INF/tags/TabBodys.tag</path>
+	    <name>Alert5</name>
+		<path>/WEB-INF/tags/Alert5.tag</path>
+   	</tag-file> 
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>TabBodyArea</name>
-       <path>/WEB-INF/tags/TabBodyArea.tag</path>
-   	</tag-file>
-   	<tag-file>
-       <name>CKEditor</name>
-       <path>/WEB-INF/tags/CKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   
@@ -281,86 +266,82 @@
        <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Rating</name>
-       <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>    		
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>StyledRating</name>
-       <path>/WEB-INF/tags/StyledRating.tag</path>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>headItems</name>
-       <path>/WEB-INF/tags/headItems.tag</path>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
-   	</tag-file>  
+   	</tag-file> 
    	<tag-file>
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Alert</name>
-		<path>/WEB-INF/tags/Alert.tag</path>
-   	</tag-file>  
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Page</name>
-		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>
+	    <name>errors</name>
+		<path>/WEB-INF/tags/Errors.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>TSTable</name>
-		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>    
-  	<tag-file>
-	    <name>Arrow</name>
-		<path>/WEB-INF/tags/Arrow.tag</path>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>AdvancedAccordian</name>
-       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
-   	</tag-file>  
-   	<tag-file>
-   		<name>RestrictedUsageAccordian</name>
-   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
    	</tag-file>
-  	<tag-file>
-	    <name>SimplePanel</name>
-		<path>/WEB-INF/tags/SimplePanel.tag</path>
-   	</tag-file>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>
    	<tag-file>
+       <name>headItems</name>
+       <path>/WEB-INF/tags/headItems.tag</path>
+   	</tag-file> 
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TextSearch</name>
-		<path>/WEB-INF/tags/TextSearch.tag</path>
-   	</tag-file>  
+       <name>Input</name>
+       <path>/WEB-INF/tags/Input.tag</path>
+   	</tag-file>
    	<tag-file>
+       <name>JSImport</name>
+       <path>/WEB-INF/tags/JSImport.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Notebook</name>
+		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file> 
    	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag-file>
-       <name>Etherpad</name>
-       <path>/WEB-INF/tags/Etherpad.tag</path>
-   	</tag-file> 
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
    	<tag-file>
-	    <name>errors</name>
-		<path>/WEB-INF/tags/Errors.tag</path>
-   	</tag-file> 
-   	<tag-file>
-	    <name>errors5</name>
-		<path>/WEB-INF/tags/Errors5.tag</path>
-   	</tag-file>    
-   	<tag-file>
-	    <name>Widget</name>
-		<path>/WEB-INF/tags/Widget.tag</path>
-   	</tag-file>   
-   	<tag-file>
 	    <name>Page5</name>
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
@@ -369,92 +350,71 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TSTable5</name>
-		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>  
+       <name>Popover</name>
+       <path>/WEB-INF/tags/Popover.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>WaitForLeader</name>
-		<path>/WEB-INF/tags/WaitForLeader.tag</path>
-   	</tag-file>  
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Alert5</name>
-		<path>/WEB-INF/tags/Alert5.tag</path>
-   	</tag-file>  
-   	<tag-file>
-       <name>FileUpload5</name>
-       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
-   	<tag>
-    <name>textarea</name>
-    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
-    <body-content>JSP</body-content>
-    <dynamic-attributes>true</dynamic-attributes>
-    <description>
-    	Render text exactly same as  original input, which even won't escape the input HTML tag.
-    </description>    
-    <attribute>
-        <description>
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>id</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>onchange</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>disabled</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-	<tag-file>
-		<name>head</name>
-	    <path>/WEB-INF/tags/Head.tag</path>
-	</tag-file>
-   	<tag-file>
-       <name>Comments</name>
-       <path>/WEB-INF/tags/Comments.tag</path>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>CommentsAuthor</name>
-       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
+   	</tag-file>    		
+   	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FileUpload</name>
-       <path>/WEB-INF/tags/FileUpload.tag</path>
+       <name>Switch</name>
+       <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>WaitingSpinner</name>
-       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>JSImport</name>
-       <path>/WEB-INF/tags/JSImport.tag</path>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Popover</name>
-       <path>/WEB-INF/tags/Popover.tag</path>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Input</name>
-       <path>/WEB-INF/tags/Input.tag</path>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Switch</name>
-       <path>/WEB-INF/tags/Switch.tag</path>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>TSTable5</name>
+		<path>/WEB-INF/tags/TSTable5.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
    	</tag-file>
+	<tag-file>
+	    <name>Widget</name>
+		<path>/WEB-INF/tags/Widget.tag</path>
+   	</tag-file> 
 </taglib>
\ No newline at end of file
Index: lams_gradebook/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u
--- lams_gradebook/web/WEB-INF/tags/Notebook.tag	(revision 0)
+++ lams_gradebook/web/WEB-INF/tags/Notebook.tag	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -0,0 +1,108 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="instructions" required="true" rtexprvalue="true"%>
+<%@ attribute name="formActionUrl" required="true" rtexprvalue="true"%>
+<%@ attribute name="formModelAttribute" required="false" rtexprvalue="true"%>
+<c:if test="${empty formModelAttribute}">
+	<c:set var="formModelAttribute" value="reflectionForm" />
+</c:if>
+<%@ attribute name="isNextActivityButtonSupported" required="true" rtexprvalue="true"%>
+<%@ attribute name="isLastActivity" required="false" rtexprvalue="true"%>
+<%@ attribute name="hiddenInputs" required="false" rtexprvalue="true"%>
+<c:if test="${empty hiddenInputs}">
+	<c:set var="hiddenInputs" value="userID,sessionMapID" />
+</c:if>
+<%@ attribute name="isNbTool" required="false" rtexprvalue="true"%>
+<c:if test="${empty isNbTool}">
+	<c:set var="isNbTool" value="false" />
+</c:if>
+
+<%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
+<%-- Default value for I18N keys --%> 
+<c:if test="${empty notebookLabelKey}">
+	<c:set var="notebookLabelKey" value="label.notebook" />
+</c:if>
+<c:if test="${empty finishButtonLabelKey}">
+	<c:set var="finishButtonLabelKey" value="label.submit" />
+</c:if>
+<c:if test="${empty nextActivityButtonLabelKey}">
+	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+</c:if>
+
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
+		}
+		function submitForm() {
+			var f = document.getElementById('reflectionForm');
+			f.submit();
+		}
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+	
+	<div id="instructions" class="instructions">
+		<lams:out value="${instructions}" escapeHtml="true" />
+	</div>
+	<hr class="mx-5">
+
+	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
+			<form:hidden path="${hiddenInput}" />
+		</c:forTokens>	
+			
+		<lams:errors5/>
+		
+		<div class="container-lg">
+			<div class="card lcard lcard-no-borders shadow mb-3">
+				<div class="card-header lcard-header-button-border">
+					<fmt:message key="${notebookLabelKey}" />
+				</div>
+				<div class="card-body mb-3">
+					<fmt:message key="${notebookLabelKey}" var="notebookLabel"/>
+					<form:textarea aria-label="${notebookLabel}" aria-multiline="true"
+						aria-required="true" required="true" path="entryText"
+						cssClass="form-control" id="focused" rows="5"></form:textarea>
+				</div>
+			</div>
+	
+			<div class="activity-bottom-buttons">
+				<button name="finishButton" id="finishButton" class="btn btn-primary">
+					<c:choose>
+						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
+							<fmt:message key="${finishButtonLabelKey}" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="${nextActivityButtonLabelKey}" />
+						</c:otherwise>
+					</c:choose>
+				</buttun>
+			</div>
+		
+		</div>
+	</form:form>
+	
+	<c:if test="${isNbTool}">
+		<!-- 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="${toolSessionID}"
+						   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
+						   pageSize="10" sortBy="1" />
+		</c:if>
+		<!-- End comments -->
+	</c:if>
+
+</lams:PageLearner>
\ No newline at end of file
Index: lams_gradebook/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r14a43ff0db3bd18db9a56dde9555420f04347c47 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_gradebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
+++ lams_gradebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -16,161 +16,123 @@
    </listener>
 
    <tag>
-
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
       <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
       <name>WebAppURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
       </icon>
       <name>help</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Help tag</description>
          <name>module</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>toolSignature</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>page</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>style</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
       </icon>
       <name>Configuration</name>
       <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Get the configuration value for the specified key</description>
          <name>key</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
       <name>LAMSURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
       </icon>
       <name>html</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
          <description>Render html tag with direction and language</description>
          <name>xhtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
       <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
       <name>out</name>
       <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>value</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>escapeHtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts role name into form usable as message resources key</description>
       <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
       <name>role</name>
       <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts role name into form usable as message resources key</description>
          <name>role</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -192,7 +154,6 @@
  	  </attribute>
    </tag>
    <tag>
-
       <description>Output details from the shared session UserDTO object</description>
       <display-name>user details</display-name>
       <icon>    
@@ -205,14 +166,9 @@
          <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
-
-	
 	<tag>
       <description>Small portrait of a user</description>
       <display-name>User Portrait</display-name>
@@ -243,32 +199,61 @@
          <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
       </attribute>
    </tag>
-	
-	<tag-file>
-       <name>Tab</name>
-       <path>/WEB-INF/tags/Tab.tag</path>
-   	</tag-file>
+   <tag>
+	    <name>textarea</name>
+	    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
+	    <body-content>JSP</body-content>
+	    <dynamic-attributes>true</dynamic-attributes>
+	    <description>
+	    	Render text exactly same as  original input, which even won't escape the input HTML tag.
+	    </description>    
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>name</name>
+	        <required>true</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>id</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>onchange</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>disabled</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+  	</tag>
+  	
    	<tag-file>
-       <name>Tabs</name>
-       <path>/WEB-INF/tags/Tabs.tag</path>
-   	</tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+   	</tag-file> 
    	<tag-file>
-       <name>TabBody</name>
-       <path>/WEB-INF/tags/TabBody.tag</path>
-   	</tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
    	<tag-file>
-       <name>TabBodys</name>
-       <path>/WEB-INF/tags/TabBodys.tag</path>
+	    <name>Alert5</name>
+		<path>/WEB-INF/tags/Alert5.tag</path>
+   	</tag-file> 
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>TabBodyArea</name>
-       <path>/WEB-INF/tags/TabBodyArea.tag</path>
-   	</tag-file>
-   	<tag-file>
-       <name>CKEditor</name>
-       <path>/WEB-INF/tags/CKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   
@@ -281,86 +266,82 @@
        <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Rating</name>
-       <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>    		
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>StyledRating</name>
-       <path>/WEB-INF/tags/StyledRating.tag</path>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>headItems</name>
-       <path>/WEB-INF/tags/headItems.tag</path>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
-   	</tag-file>  
+   	</tag-file> 
    	<tag-file>
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Alert</name>
-		<path>/WEB-INF/tags/Alert.tag</path>
-   	</tag-file>  
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Page</name>
-		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>
+	    <name>errors</name>
+		<path>/WEB-INF/tags/Errors.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>TSTable</name>
-		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>    
-  	<tag-file>
-	    <name>Arrow</name>
-		<path>/WEB-INF/tags/Arrow.tag</path>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>AdvancedAccordian</name>
-       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
-   	</tag-file>  
-   	<tag-file>
-   		<name>RestrictedUsageAccordian</name>
-   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
    	</tag-file>
-  	<tag-file>
-	    <name>SimplePanel</name>
-		<path>/WEB-INF/tags/SimplePanel.tag</path>
-   	</tag-file>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>
    	<tag-file>
+       <name>headItems</name>
+       <path>/WEB-INF/tags/headItems.tag</path>
+   	</tag-file> 
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TextSearch</name>
-		<path>/WEB-INF/tags/TextSearch.tag</path>
-   	</tag-file>  
+       <name>Input</name>
+       <path>/WEB-INF/tags/Input.tag</path>
+   	</tag-file>
    	<tag-file>
+       <name>JSImport</name>
+       <path>/WEB-INF/tags/JSImport.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Notebook</name>
+		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file> 
    	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag-file>
-       <name>Etherpad</name>
-       <path>/WEB-INF/tags/Etherpad.tag</path>
-   	</tag-file> 
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
    	<tag-file>
-	    <name>errors</name>
-		<path>/WEB-INF/tags/Errors.tag</path>
-   	</tag-file> 
-   	<tag-file>
-	    <name>errors5</name>
-		<path>/WEB-INF/tags/Errors5.tag</path>
-   	</tag-file>    
-   	<tag-file>
-	    <name>Widget</name>
-		<path>/WEB-INF/tags/Widget.tag</path>
-   	</tag-file>   
-   	<tag-file>
 	    <name>Page5</name>
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
@@ -369,92 +350,71 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TSTable5</name>
-		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>  
+       <name>Popover</name>
+       <path>/WEB-INF/tags/Popover.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>WaitForLeader</name>
-		<path>/WEB-INF/tags/WaitForLeader.tag</path>
-   	</tag-file>  
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Alert5</name>
-		<path>/WEB-INF/tags/Alert5.tag</path>
-   	</tag-file>  
-   	<tag-file>
-       <name>FileUpload5</name>
-       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
-   	<tag>
-    <name>textarea</name>
-    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
-    <body-content>JSP</body-content>
-    <dynamic-attributes>true</dynamic-attributes>
-    <description>
-    	Render text exactly same as  original input, which even won't escape the input HTML tag.
-    </description>    
-    <attribute>
-        <description>
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>id</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>onchange</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>disabled</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-	<tag-file>
-		<name>head</name>
-	    <path>/WEB-INF/tags/Head.tag</path>
-	</tag-file>
-   	<tag-file>
-       <name>Comments</name>
-       <path>/WEB-INF/tags/Comments.tag</path>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>CommentsAuthor</name>
-       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
+   	</tag-file>    		
+   	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FileUpload</name>
-       <path>/WEB-INF/tags/FileUpload.tag</path>
+       <name>Switch</name>
+       <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>WaitingSpinner</name>
-       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>JSImport</name>
-       <path>/WEB-INF/tags/JSImport.tag</path>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Popover</name>
-       <path>/WEB-INF/tags/Popover.tag</path>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Input</name>
-       <path>/WEB-INF/tags/Input.tag</path>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Switch</name>
-       <path>/WEB-INF/tags/Switch.tag</path>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>TSTable5</name>
+		<path>/WEB-INF/tags/TSTable5.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
    	</tag-file>
+	<tag-file>
+	    <name>Widget</name>
+		<path>/WEB-INF/tags/Widget.tag</path>
+   	</tag-file> 
 </taglib>
\ No newline at end of file
Index: lams_learning/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u
--- lams_learning/web/WEB-INF/tags/Notebook.tag	(revision 0)
+++ lams_learning/web/WEB-INF/tags/Notebook.tag	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -0,0 +1,108 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="instructions" required="true" rtexprvalue="true"%>
+<%@ attribute name="formActionUrl" required="true" rtexprvalue="true"%>
+<%@ attribute name="formModelAttribute" required="false" rtexprvalue="true"%>
+<c:if test="${empty formModelAttribute}">
+	<c:set var="formModelAttribute" value="reflectionForm" />
+</c:if>
+<%@ attribute name="isNextActivityButtonSupported" required="true" rtexprvalue="true"%>
+<%@ attribute name="isLastActivity" required="false" rtexprvalue="true"%>
+<%@ attribute name="hiddenInputs" required="false" rtexprvalue="true"%>
+<c:if test="${empty hiddenInputs}">
+	<c:set var="hiddenInputs" value="userID,sessionMapID" />
+</c:if>
+<%@ attribute name="isNbTool" required="false" rtexprvalue="true"%>
+<c:if test="${empty isNbTool}">
+	<c:set var="isNbTool" value="false" />
+</c:if>
+
+<%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
+<%-- Default value for I18N keys --%> 
+<c:if test="${empty notebookLabelKey}">
+	<c:set var="notebookLabelKey" value="label.notebook" />
+</c:if>
+<c:if test="${empty finishButtonLabelKey}">
+	<c:set var="finishButtonLabelKey" value="label.submit" />
+</c:if>
+<c:if test="${empty nextActivityButtonLabelKey}">
+	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+</c:if>
+
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
+		}
+		function submitForm() {
+			var f = document.getElementById('reflectionForm');
+			f.submit();
+		}
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+	
+	<div id="instructions" class="instructions">
+		<lams:out value="${instructions}" escapeHtml="true" />
+	</div>
+	<hr class="mx-5">
+
+	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
+			<form:hidden path="${hiddenInput}" />
+		</c:forTokens>	
+			
+		<lams:errors5/>
+		
+		<div class="container-lg">
+			<div class="card lcard lcard-no-borders shadow mb-3">
+				<div class="card-header lcard-header-button-border">
+					<fmt:message key="${notebookLabelKey}" />
+				</div>
+				<div class="card-body mb-3">
+					<fmt:message key="${notebookLabelKey}" var="notebookLabel"/>
+					<form:textarea aria-label="${notebookLabel}" aria-multiline="true"
+						aria-required="true" required="true" path="entryText"
+						cssClass="form-control" id="focused" rows="5"></form:textarea>
+				</div>
+			</div>
+	
+			<div class="activity-bottom-buttons">
+				<button name="finishButton" id="finishButton" class="btn btn-primary">
+					<c:choose>
+						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
+							<fmt:message key="${finishButtonLabelKey}" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="${nextActivityButtonLabelKey}" />
+						</c:otherwise>
+					</c:choose>
+				</buttun>
+			</div>
+		
+		</div>
+	</form:form>
+	
+	<c:if test="${isNbTool}">
+		<!-- 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="${toolSessionID}"
+						   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
+						   pageSize="10" sortBy="1" />
+		</c:if>
+		<!-- End comments -->
+	</c:if>
+
+</lams:PageLearner>
\ No newline at end of file
Index: lams_learning/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r14a43ff0db3bd18db9a56dde9555420f04347c47 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_learning/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
+++ lams_learning/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -16,161 +16,123 @@
    </listener>
 
    <tag>
-
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
       <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
       <name>WebAppURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
       </icon>
       <name>help</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Help tag</description>
          <name>module</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>toolSignature</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>page</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>style</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
       </icon>
       <name>Configuration</name>
       <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Get the configuration value for the specified key</description>
          <name>key</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
       <name>LAMSURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
       </icon>
       <name>html</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
          <description>Render html tag with direction and language</description>
          <name>xhtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
       <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
       <name>out</name>
       <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>value</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>escapeHtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts role name into form usable as message resources key</description>
       <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
       <name>role</name>
       <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts role name into form usable as message resources key</description>
          <name>role</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -192,7 +154,6 @@
  	  </attribute>
    </tag>
    <tag>
-
       <description>Output details from the shared session UserDTO object</description>
       <display-name>user details</display-name>
       <icon>    
@@ -205,14 +166,9 @@
          <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
-
-	
 	<tag>
       <description>Small portrait of a user</description>
       <display-name>User Portrait</display-name>
@@ -243,32 +199,61 @@
          <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
       </attribute>
    </tag>
-	
-	<tag-file>
-       <name>Tab</name>
-       <path>/WEB-INF/tags/Tab.tag</path>
-   	</tag-file>
+   <tag>
+	    <name>textarea</name>
+	    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
+	    <body-content>JSP</body-content>
+	    <dynamic-attributes>true</dynamic-attributes>
+	    <description>
+	    	Render text exactly same as  original input, which even won't escape the input HTML tag.
+	    </description>    
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>name</name>
+	        <required>true</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>id</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>onchange</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>disabled</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+  	</tag>
+  	
    	<tag-file>
-       <name>Tabs</name>
-       <path>/WEB-INF/tags/Tabs.tag</path>
-   	</tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+   	</tag-file> 
    	<tag-file>
-       <name>TabBody</name>
-       <path>/WEB-INF/tags/TabBody.tag</path>
-   	</tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
    	<tag-file>
-       <name>TabBodys</name>
-       <path>/WEB-INF/tags/TabBodys.tag</path>
+	    <name>Alert5</name>
+		<path>/WEB-INF/tags/Alert5.tag</path>
+   	</tag-file> 
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>TabBodyArea</name>
-       <path>/WEB-INF/tags/TabBodyArea.tag</path>
-   	</tag-file>
-   	<tag-file>
-       <name>CKEditor</name>
-       <path>/WEB-INF/tags/CKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   
@@ -281,86 +266,82 @@
        <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Rating</name>
-       <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>    		
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>StyledRating</name>
-       <path>/WEB-INF/tags/StyledRating.tag</path>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>headItems</name>
-       <path>/WEB-INF/tags/headItems.tag</path>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
-   	</tag-file>  
+   	</tag-file> 
    	<tag-file>
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Alert</name>
-		<path>/WEB-INF/tags/Alert.tag</path>
-   	</tag-file>  
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Page</name>
-		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>
+	    <name>errors</name>
+		<path>/WEB-INF/tags/Errors.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>TSTable</name>
-		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>    
-  	<tag-file>
-	    <name>Arrow</name>
-		<path>/WEB-INF/tags/Arrow.tag</path>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>AdvancedAccordian</name>
-       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
-   	</tag-file>  
-   	<tag-file>
-   		<name>RestrictedUsageAccordian</name>
-   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
    	</tag-file>
-  	<tag-file>
-	    <name>SimplePanel</name>
-		<path>/WEB-INF/tags/SimplePanel.tag</path>
-   	</tag-file>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>
    	<tag-file>
+       <name>headItems</name>
+       <path>/WEB-INF/tags/headItems.tag</path>
+   	</tag-file> 
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TextSearch</name>
-		<path>/WEB-INF/tags/TextSearch.tag</path>
-   	</tag-file>  
+       <name>Input</name>
+       <path>/WEB-INF/tags/Input.tag</path>
+   	</tag-file>
    	<tag-file>
+       <name>JSImport</name>
+       <path>/WEB-INF/tags/JSImport.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Notebook</name>
+		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file> 
    	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag-file>
-       <name>Etherpad</name>
-       <path>/WEB-INF/tags/Etherpad.tag</path>
-   	</tag-file> 
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
    	<tag-file>
-	    <name>errors</name>
-		<path>/WEB-INF/tags/Errors.tag</path>
-   	</tag-file> 
-   	<tag-file>
-	    <name>errors5</name>
-		<path>/WEB-INF/tags/Errors5.tag</path>
-   	</tag-file>    
-   	<tag-file>
-	    <name>Widget</name>
-		<path>/WEB-INF/tags/Widget.tag</path>
-   	</tag-file>   
-   	<tag-file>
 	    <name>Page5</name>
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
@@ -369,92 +350,71 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TSTable5</name>
-		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>  
+       <name>Popover</name>
+       <path>/WEB-INF/tags/Popover.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>WaitForLeader</name>
-		<path>/WEB-INF/tags/WaitForLeader.tag</path>
-   	</tag-file>  
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Alert5</name>
-		<path>/WEB-INF/tags/Alert5.tag</path>
-   	</tag-file>  
-   	<tag-file>
-       <name>FileUpload5</name>
-       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
-   	<tag>
-    <name>textarea</name>
-    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
-    <body-content>JSP</body-content>
-    <dynamic-attributes>true</dynamic-attributes>
-    <description>
-    	Render text exactly same as  original input, which even won't escape the input HTML tag.
-    </description>    
-    <attribute>
-        <description>
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>id</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>onchange</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>disabled</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-	<tag-file>
-		<name>head</name>
-	    <path>/WEB-INF/tags/Head.tag</path>
-	</tag-file>
-   	<tag-file>
-       <name>Comments</name>
-       <path>/WEB-INF/tags/Comments.tag</path>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>CommentsAuthor</name>
-       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
+   	</tag-file>    		
+   	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FileUpload</name>
-       <path>/WEB-INF/tags/FileUpload.tag</path>
+       <name>Switch</name>
+       <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>WaitingSpinner</name>
-       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>JSImport</name>
-       <path>/WEB-INF/tags/JSImport.tag</path>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Popover</name>
-       <path>/WEB-INF/tags/Popover.tag</path>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Input</name>
-       <path>/WEB-INF/tags/Input.tag</path>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Switch</name>
-       <path>/WEB-INF/tags/Switch.tag</path>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>TSTable5</name>
+		<path>/WEB-INF/tags/TSTable5.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
    	</tag-file>
+	<tag-file>
+	    <name>Widget</name>
+		<path>/WEB-INF/tags/Widget.tag</path>
+   	</tag-file> 
 </taglib>
\ No newline at end of file
Index: lams_monitoring/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u
--- lams_monitoring/web/WEB-INF/tags/Notebook.tag	(revision 0)
+++ lams_monitoring/web/WEB-INF/tags/Notebook.tag	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -0,0 +1,108 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="instructions" required="true" rtexprvalue="true"%>
+<%@ attribute name="formActionUrl" required="true" rtexprvalue="true"%>
+<%@ attribute name="formModelAttribute" required="false" rtexprvalue="true"%>
+<c:if test="${empty formModelAttribute}">
+	<c:set var="formModelAttribute" value="reflectionForm" />
+</c:if>
+<%@ attribute name="isNextActivityButtonSupported" required="true" rtexprvalue="true"%>
+<%@ attribute name="isLastActivity" required="false" rtexprvalue="true"%>
+<%@ attribute name="hiddenInputs" required="false" rtexprvalue="true"%>
+<c:if test="${empty hiddenInputs}">
+	<c:set var="hiddenInputs" value="userID,sessionMapID" />
+</c:if>
+<%@ attribute name="isNbTool" required="false" rtexprvalue="true"%>
+<c:if test="${empty isNbTool}">
+	<c:set var="isNbTool" value="false" />
+</c:if>
+
+<%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
+<%-- Default value for I18N keys --%> 
+<c:if test="${empty notebookLabelKey}">
+	<c:set var="notebookLabelKey" value="label.notebook" />
+</c:if>
+<c:if test="${empty finishButtonLabelKey}">
+	<c:set var="finishButtonLabelKey" value="label.submit" />
+</c:if>
+<c:if test="${empty nextActivityButtonLabelKey}">
+	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+</c:if>
+
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
+		}
+		function submitForm() {
+			var f = document.getElementById('reflectionForm');
+			f.submit();
+		}
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+	
+	<div id="instructions" class="instructions">
+		<lams:out value="${instructions}" escapeHtml="true" />
+	</div>
+	<hr class="mx-5">
+
+	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
+			<form:hidden path="${hiddenInput}" />
+		</c:forTokens>	
+			
+		<lams:errors5/>
+		
+		<div class="container-lg">
+			<div class="card lcard lcard-no-borders shadow mb-3">
+				<div class="card-header lcard-header-button-border">
+					<fmt:message key="${notebookLabelKey}" />
+				</div>
+				<div class="card-body mb-3">
+					<fmt:message key="${notebookLabelKey}" var="notebookLabel"/>
+					<form:textarea aria-label="${notebookLabel}" aria-multiline="true"
+						aria-required="true" required="true" path="entryText"
+						cssClass="form-control" id="focused" rows="5"></form:textarea>
+				</div>
+			</div>
+	
+			<div class="activity-bottom-buttons">
+				<button name="finishButton" id="finishButton" class="btn btn-primary">
+					<c:choose>
+						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
+							<fmt:message key="${finishButtonLabelKey}" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="${nextActivityButtonLabelKey}" />
+						</c:otherwise>
+					</c:choose>
+				</buttun>
+			</div>
+		
+		</div>
+	</form:form>
+	
+	<c:if test="${isNbTool}">
+		<!-- 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="${toolSessionID}"
+						   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
+						   pageSize="10" sortBy="1" />
+		</c:if>
+		<!-- End comments -->
+	</c:if>
+
+</lams:PageLearner>
\ No newline at end of file
Index: lams_monitoring/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r14a43ff0db3bd18db9a56dde9555420f04347c47 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_monitoring/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
+++ lams_monitoring/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -16,161 +16,123 @@
    </listener>
 
    <tag>
-
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
       <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
       <name>WebAppURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
       </icon>
       <name>help</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Help tag</description>
          <name>module</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>toolSignature</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>page</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>style</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
       </icon>
       <name>Configuration</name>
       <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Get the configuration value for the specified key</description>
          <name>key</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
       <name>LAMSURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
       </icon>
       <name>html</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
          <description>Render html tag with direction and language</description>
          <name>xhtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
       <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
       <name>out</name>
       <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>value</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>escapeHtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts role name into form usable as message resources key</description>
       <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
       <name>role</name>
       <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts role name into form usable as message resources key</description>
          <name>role</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -192,7 +154,6 @@
  	  </attribute>
    </tag>
    <tag>
-
       <description>Output details from the shared session UserDTO object</description>
       <display-name>user details</display-name>
       <icon>    
@@ -205,14 +166,9 @@
          <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
-
-	
 	<tag>
       <description>Small portrait of a user</description>
       <display-name>User Portrait</display-name>
@@ -243,32 +199,61 @@
          <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
       </attribute>
    </tag>
-	
-	<tag-file>
-       <name>Tab</name>
-       <path>/WEB-INF/tags/Tab.tag</path>
-   	</tag-file>
+   <tag>
+	    <name>textarea</name>
+	    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
+	    <body-content>JSP</body-content>
+	    <dynamic-attributes>true</dynamic-attributes>
+	    <description>
+	    	Render text exactly same as  original input, which even won't escape the input HTML tag.
+	    </description>    
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>name</name>
+	        <required>true</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>id</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>onchange</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>disabled</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+  	</tag>
+  	
    	<tag-file>
-       <name>Tabs</name>
-       <path>/WEB-INF/tags/Tabs.tag</path>
-   	</tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+   	</tag-file> 
    	<tag-file>
-       <name>TabBody</name>
-       <path>/WEB-INF/tags/TabBody.tag</path>
-   	</tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
    	<tag-file>
-       <name>TabBodys</name>
-       <path>/WEB-INF/tags/TabBodys.tag</path>
+	    <name>Alert5</name>
+		<path>/WEB-INF/tags/Alert5.tag</path>
+   	</tag-file> 
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>TabBodyArea</name>
-       <path>/WEB-INF/tags/TabBodyArea.tag</path>
-   	</tag-file>
-   	<tag-file>
-       <name>CKEditor</name>
-       <path>/WEB-INF/tags/CKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   
@@ -281,86 +266,82 @@
        <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Rating</name>
-       <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>    		
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>StyledRating</name>
-       <path>/WEB-INF/tags/StyledRating.tag</path>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>headItems</name>
-       <path>/WEB-INF/tags/headItems.tag</path>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
-   	</tag-file>  
+   	</tag-file> 
    	<tag-file>
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Alert</name>
-		<path>/WEB-INF/tags/Alert.tag</path>
-   	</tag-file>  
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Page</name>
-		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>
+	    <name>errors</name>
+		<path>/WEB-INF/tags/Errors.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>TSTable</name>
-		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>    
-  	<tag-file>
-	    <name>Arrow</name>
-		<path>/WEB-INF/tags/Arrow.tag</path>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>AdvancedAccordian</name>
-       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
-   	</tag-file>  
-   	<tag-file>
-   		<name>RestrictedUsageAccordian</name>
-   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
    	</tag-file>
-  	<tag-file>
-	    <name>SimplePanel</name>
-		<path>/WEB-INF/tags/SimplePanel.tag</path>
-   	</tag-file>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>
    	<tag-file>
+       <name>headItems</name>
+       <path>/WEB-INF/tags/headItems.tag</path>
+   	</tag-file> 
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TextSearch</name>
-		<path>/WEB-INF/tags/TextSearch.tag</path>
-   	</tag-file>  
+       <name>Input</name>
+       <path>/WEB-INF/tags/Input.tag</path>
+   	</tag-file>
    	<tag-file>
+       <name>JSImport</name>
+       <path>/WEB-INF/tags/JSImport.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Notebook</name>
+		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file> 
    	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag-file>
-       <name>Etherpad</name>
-       <path>/WEB-INF/tags/Etherpad.tag</path>
-   	</tag-file> 
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
    	<tag-file>
-	    <name>errors</name>
-		<path>/WEB-INF/tags/Errors.tag</path>
-   	</tag-file> 
-   	<tag-file>
-	    <name>errors5</name>
-		<path>/WEB-INF/tags/Errors5.tag</path>
-   	</tag-file>    
-   	<tag-file>
-	    <name>Widget</name>
-		<path>/WEB-INF/tags/Widget.tag</path>
-   	</tag-file>   
-   	<tag-file>
 	    <name>Page5</name>
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
@@ -369,92 +350,71 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TSTable5</name>
-		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>  
+       <name>Popover</name>
+       <path>/WEB-INF/tags/Popover.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>WaitForLeader</name>
-		<path>/WEB-INF/tags/WaitForLeader.tag</path>
-   	</tag-file>  
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Alert5</name>
-		<path>/WEB-INF/tags/Alert5.tag</path>
-   	</tag-file>  
-   	<tag-file>
-       <name>FileUpload5</name>
-       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
-   	<tag>
-    <name>textarea</name>
-    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
-    <body-content>JSP</body-content>
-    <dynamic-attributes>true</dynamic-attributes>
-    <description>
-    	Render text exactly same as  original input, which even won't escape the input HTML tag.
-    </description>    
-    <attribute>
-        <description>
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>id</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>onchange</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>disabled</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-	<tag-file>
-		<name>head</name>
-	    <path>/WEB-INF/tags/Head.tag</path>
-	</tag-file>
-   	<tag-file>
-       <name>Comments</name>
-       <path>/WEB-INF/tags/Comments.tag</path>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>CommentsAuthor</name>
-       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
+   	</tag-file>    		
+   	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FileUpload</name>
-       <path>/WEB-INF/tags/FileUpload.tag</path>
+       <name>Switch</name>
+       <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>WaitingSpinner</name>
-       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>JSImport</name>
-       <path>/WEB-INF/tags/JSImport.tag</path>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Popover</name>
-       <path>/WEB-INF/tags/Popover.tag</path>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Input</name>
-       <path>/WEB-INF/tags/Input.tag</path>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Switch</name>
-       <path>/WEB-INF/tags/Switch.tag</path>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>TSTable5</name>
+		<path>/WEB-INF/tags/TSTable5.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
    	</tag-file>
+	<tag-file>
+	    <name>Widget</name>
+		<path>/WEB-INF/tags/Widget.tag</path>
+   	</tag-file> 
 </taglib>
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u
--- lams_tool_assessment/web/WEB-INF/tags/Notebook.tag	(revision 0)
+++ lams_tool_assessment/web/WEB-INF/tags/Notebook.tag	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -0,0 +1,108 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="instructions" required="true" rtexprvalue="true"%>
+<%@ attribute name="formActionUrl" required="true" rtexprvalue="true"%>
+<%@ attribute name="formModelAttribute" required="false" rtexprvalue="true"%>
+<c:if test="${empty formModelAttribute}">
+	<c:set var="formModelAttribute" value="reflectionForm" />
+</c:if>
+<%@ attribute name="isNextActivityButtonSupported" required="true" rtexprvalue="true"%>
+<%@ attribute name="isLastActivity" required="false" rtexprvalue="true"%>
+<%@ attribute name="hiddenInputs" required="false" rtexprvalue="true"%>
+<c:if test="${empty hiddenInputs}">
+	<c:set var="hiddenInputs" value="userID,sessionMapID" />
+</c:if>
+<%@ attribute name="isNbTool" required="false" rtexprvalue="true"%>
+<c:if test="${empty isNbTool}">
+	<c:set var="isNbTool" value="false" />
+</c:if>
+
+<%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
+<%-- Default value for I18N keys --%> 
+<c:if test="${empty notebookLabelKey}">
+	<c:set var="notebookLabelKey" value="label.notebook" />
+</c:if>
+<c:if test="${empty finishButtonLabelKey}">
+	<c:set var="finishButtonLabelKey" value="label.submit" />
+</c:if>
+<c:if test="${empty nextActivityButtonLabelKey}">
+	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+</c:if>
+
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
+		}
+		function submitForm() {
+			var f = document.getElementById('reflectionForm');
+			f.submit();
+		}
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+	
+	<div id="instructions" class="instructions">
+		<lams:out value="${instructions}" escapeHtml="true" />
+	</div>
+	<hr class="mx-5">
+
+	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
+			<form:hidden path="${hiddenInput}" />
+		</c:forTokens>	
+			
+		<lams:errors5/>
+		
+		<div class="container-lg">
+			<div class="card lcard lcard-no-borders shadow mb-3">
+				<div class="card-header lcard-header-button-border">
+					<fmt:message key="${notebookLabelKey}" />
+				</div>
+				<div class="card-body mb-3">
+					<fmt:message key="${notebookLabelKey}" var="notebookLabel"/>
+					<form:textarea aria-label="${notebookLabel}" aria-multiline="true"
+						aria-required="true" required="true" path="entryText"
+						cssClass="form-control" id="focused" rows="5"></form:textarea>
+				</div>
+			</div>
+	
+			<div class="activity-bottom-buttons">
+				<button name="finishButton" id="finishButton" class="btn btn-primary">
+					<c:choose>
+						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
+							<fmt:message key="${finishButtonLabelKey}" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="${nextActivityButtonLabelKey}" />
+						</c:otherwise>
+					</c:choose>
+				</buttun>
+			</div>
+		
+		</div>
+	</form:form>
+	
+	<c:if test="${isNbTool}">
+		<!-- 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="${toolSessionID}"
+						   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
+						   pageSize="10" sortBy="1" />
+		</c:if>
+		<!-- End comments -->
+	</c:if>
+
+</lams:PageLearner>
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r14a43ff0db3bd18db9a56dde9555420f04347c47 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
+++ lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -16,161 +16,123 @@
    </listener>
 
    <tag>
-
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
       <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
       <name>WebAppURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
       </icon>
       <name>help</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Help tag</description>
          <name>module</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>toolSignature</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>page</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>style</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
       </icon>
       <name>Configuration</name>
       <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Get the configuration value for the specified key</description>
          <name>key</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
       <name>LAMSURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
       </icon>
       <name>html</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
          <description>Render html tag with direction and language</description>
          <name>xhtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
       <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
       <name>out</name>
       <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>value</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>escapeHtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts role name into form usable as message resources key</description>
       <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
       <name>role</name>
       <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts role name into form usable as message resources key</description>
          <name>role</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -192,7 +154,6 @@
  	  </attribute>
    </tag>
    <tag>
-
       <description>Output details from the shared session UserDTO object</description>
       <display-name>user details</display-name>
       <icon>    
@@ -205,14 +166,9 @@
          <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
-
-	
 	<tag>
       <description>Small portrait of a user</description>
       <display-name>User Portrait</display-name>
@@ -243,32 +199,61 @@
          <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
       </attribute>
    </tag>
-	
-	<tag-file>
-       <name>Tab</name>
-       <path>/WEB-INF/tags/Tab.tag</path>
-   	</tag-file>
+   <tag>
+	    <name>textarea</name>
+	    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
+	    <body-content>JSP</body-content>
+	    <dynamic-attributes>true</dynamic-attributes>
+	    <description>
+	    	Render text exactly same as  original input, which even won't escape the input HTML tag.
+	    </description>    
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>name</name>
+	        <required>true</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>id</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>onchange</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>disabled</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+  	</tag>
+  	
    	<tag-file>
-       <name>Tabs</name>
-       <path>/WEB-INF/tags/Tabs.tag</path>
-   	</tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+   	</tag-file> 
    	<tag-file>
-       <name>TabBody</name>
-       <path>/WEB-INF/tags/TabBody.tag</path>
-   	</tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
    	<tag-file>
-       <name>TabBodys</name>
-       <path>/WEB-INF/tags/TabBodys.tag</path>
+	    <name>Alert5</name>
+		<path>/WEB-INF/tags/Alert5.tag</path>
+   	</tag-file> 
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>TabBodyArea</name>
-       <path>/WEB-INF/tags/TabBodyArea.tag</path>
-   	</tag-file>
-   	<tag-file>
-       <name>CKEditor</name>
-       <path>/WEB-INF/tags/CKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   
@@ -281,86 +266,82 @@
        <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Rating</name>
-       <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>    		
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>StyledRating</name>
-       <path>/WEB-INF/tags/StyledRating.tag</path>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>headItems</name>
-       <path>/WEB-INF/tags/headItems.tag</path>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
-   	</tag-file>  
+   	</tag-file> 
    	<tag-file>
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Alert</name>
-		<path>/WEB-INF/tags/Alert.tag</path>
-   	</tag-file>  
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Page</name>
-		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>
+	    <name>errors</name>
+		<path>/WEB-INF/tags/Errors.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>TSTable</name>
-		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>    
-  	<tag-file>
-	    <name>Arrow</name>
-		<path>/WEB-INF/tags/Arrow.tag</path>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>AdvancedAccordian</name>
-       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
-   	</tag-file>  
-   	<tag-file>
-   		<name>RestrictedUsageAccordian</name>
-   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
    	</tag-file>
-  	<tag-file>
-	    <name>SimplePanel</name>
-		<path>/WEB-INF/tags/SimplePanel.tag</path>
-   	</tag-file>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>
    	<tag-file>
+       <name>headItems</name>
+       <path>/WEB-INF/tags/headItems.tag</path>
+   	</tag-file> 
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TextSearch</name>
-		<path>/WEB-INF/tags/TextSearch.tag</path>
-   	</tag-file>  
+       <name>Input</name>
+       <path>/WEB-INF/tags/Input.tag</path>
+   	</tag-file>
    	<tag-file>
+       <name>JSImport</name>
+       <path>/WEB-INF/tags/JSImport.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Notebook</name>
+		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file> 
    	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag-file>
-       <name>Etherpad</name>
-       <path>/WEB-INF/tags/Etherpad.tag</path>
-   	</tag-file> 
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
    	<tag-file>
-	    <name>errors</name>
-		<path>/WEB-INF/tags/Errors.tag</path>
-   	</tag-file> 
-   	<tag-file>
-	    <name>errors5</name>
-		<path>/WEB-INF/tags/Errors5.tag</path>
-   	</tag-file>    
-   	<tag-file>
-	    <name>Widget</name>
-		<path>/WEB-INF/tags/Widget.tag</path>
-   	</tag-file>   
-   	<tag-file>
 	    <name>Page5</name>
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
@@ -369,92 +350,71 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TSTable5</name>
-		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>  
+       <name>Popover</name>
+       <path>/WEB-INF/tags/Popover.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>WaitForLeader</name>
-		<path>/WEB-INF/tags/WaitForLeader.tag</path>
-   	</tag-file>  
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Alert5</name>
-		<path>/WEB-INF/tags/Alert5.tag</path>
-   	</tag-file>  
-   	<tag-file>
-       <name>FileUpload5</name>
-       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
-   	<tag>
-    <name>textarea</name>
-    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
-    <body-content>JSP</body-content>
-    <dynamic-attributes>true</dynamic-attributes>
-    <description>
-    	Render text exactly same as  original input, which even won't escape the input HTML tag.
-    </description>    
-    <attribute>
-        <description>
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>id</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>onchange</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>disabled</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-	<tag-file>
-		<name>head</name>
-	    <path>/WEB-INF/tags/Head.tag</path>
-	</tag-file>
-   	<tag-file>
-       <name>Comments</name>
-       <path>/WEB-INF/tags/Comments.tag</path>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>CommentsAuthor</name>
-       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
+   	</tag-file>    		
+   	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FileUpload</name>
-       <path>/WEB-INF/tags/FileUpload.tag</path>
+       <name>Switch</name>
+       <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>WaitingSpinner</name>
-       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>JSImport</name>
-       <path>/WEB-INF/tags/JSImport.tag</path>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Popover</name>
-       <path>/WEB-INF/tags/Popover.tag</path>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Input</name>
-       <path>/WEB-INF/tags/Input.tag</path>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Switch</name>
-       <path>/WEB-INF/tags/Switch.tag</path>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>TSTable5</name>
+		<path>/WEB-INF/tags/TSTable5.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
    	</tag-file>
+	<tag-file>
+	    <name>Widget</name>
+		<path>/WEB-INF/tags/Widget.tag</path>
+   	</tag-file> 
 </taglib>
\ No newline at end of file
Index: lams_tool_chat/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u
--- lams_tool_chat/web/WEB-INF/tags/Notebook.tag	(revision 0)
+++ lams_tool_chat/web/WEB-INF/tags/Notebook.tag	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -0,0 +1,108 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="instructions" required="true" rtexprvalue="true"%>
+<%@ attribute name="formActionUrl" required="true" rtexprvalue="true"%>
+<%@ attribute name="formModelAttribute" required="false" rtexprvalue="true"%>
+<c:if test="${empty formModelAttribute}">
+	<c:set var="formModelAttribute" value="reflectionForm" />
+</c:if>
+<%@ attribute name="isNextActivityButtonSupported" required="true" rtexprvalue="true"%>
+<%@ attribute name="isLastActivity" required="false" rtexprvalue="true"%>
+<%@ attribute name="hiddenInputs" required="false" rtexprvalue="true"%>
+<c:if test="${empty hiddenInputs}">
+	<c:set var="hiddenInputs" value="userID,sessionMapID" />
+</c:if>
+<%@ attribute name="isNbTool" required="false" rtexprvalue="true"%>
+<c:if test="${empty isNbTool}">
+	<c:set var="isNbTool" value="false" />
+</c:if>
+
+<%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
+<%-- Default value for I18N keys --%> 
+<c:if test="${empty notebookLabelKey}">
+	<c:set var="notebookLabelKey" value="label.notebook" />
+</c:if>
+<c:if test="${empty finishButtonLabelKey}">
+	<c:set var="finishButtonLabelKey" value="label.submit" />
+</c:if>
+<c:if test="${empty nextActivityButtonLabelKey}">
+	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+</c:if>
+
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
+		}
+		function submitForm() {
+			var f = document.getElementById('reflectionForm');
+			f.submit();
+		}
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+	
+	<div id="instructions" class="instructions">
+		<lams:out value="${instructions}" escapeHtml="true" />
+	</div>
+	<hr class="mx-5">
+
+	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
+			<form:hidden path="${hiddenInput}" />
+		</c:forTokens>	
+			
+		<lams:errors5/>
+		
+		<div class="container-lg">
+			<div class="card lcard lcard-no-borders shadow mb-3">
+				<div class="card-header lcard-header-button-border">
+					<fmt:message key="${notebookLabelKey}" />
+				</div>
+				<div class="card-body mb-3">
+					<fmt:message key="${notebookLabelKey}" var="notebookLabel"/>
+					<form:textarea aria-label="${notebookLabel}" aria-multiline="true"
+						aria-required="true" required="true" path="entryText"
+						cssClass="form-control" id="focused" rows="5"></form:textarea>
+				</div>
+			</div>
+	
+			<div class="activity-bottom-buttons">
+				<button name="finishButton" id="finishButton" class="btn btn-primary">
+					<c:choose>
+						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
+							<fmt:message key="${finishButtonLabelKey}" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="${nextActivityButtonLabelKey}" />
+						</c:otherwise>
+					</c:choose>
+				</buttun>
+			</div>
+		
+		</div>
+	</form:form>
+	
+	<c:if test="${isNbTool}">
+		<!-- 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="${toolSessionID}"
+						   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
+						   pageSize="10" sortBy="1" />
+		</c:if>
+		<!-- End comments -->
+	</c:if>
+
+</lams:PageLearner>
\ No newline at end of file
Index: lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r14a43ff0db3bd18db9a56dde9555420f04347c47 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
+++ lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -16,161 +16,123 @@
    </listener>
 
    <tag>
-
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
       <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
       <name>WebAppURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
       </icon>
       <name>help</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Help tag</description>
          <name>module</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>toolSignature</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>page</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>style</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
       </icon>
       <name>Configuration</name>
       <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Get the configuration value for the specified key</description>
          <name>key</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
       <name>LAMSURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
       </icon>
       <name>html</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
          <description>Render html tag with direction and language</description>
          <name>xhtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
       <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
       <name>out</name>
       <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>value</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>escapeHtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts role name into form usable as message resources key</description>
       <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
       <name>role</name>
       <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts role name into form usable as message resources key</description>
          <name>role</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -192,7 +154,6 @@
  	  </attribute>
    </tag>
    <tag>
-
       <description>Output details from the shared session UserDTO object</description>
       <display-name>user details</display-name>
       <icon>    
@@ -205,14 +166,9 @@
          <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
-
-	
 	<tag>
       <description>Small portrait of a user</description>
       <display-name>User Portrait</display-name>
@@ -243,32 +199,61 @@
          <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
       </attribute>
    </tag>
-	
-	<tag-file>
-       <name>Tab</name>
-       <path>/WEB-INF/tags/Tab.tag</path>
-   	</tag-file>
+   <tag>
+	    <name>textarea</name>
+	    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
+	    <body-content>JSP</body-content>
+	    <dynamic-attributes>true</dynamic-attributes>
+	    <description>
+	    	Render text exactly same as  original input, which even won't escape the input HTML tag.
+	    </description>    
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>name</name>
+	        <required>true</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>id</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>onchange</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>disabled</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+  	</tag>
+  	
    	<tag-file>
-       <name>Tabs</name>
-       <path>/WEB-INF/tags/Tabs.tag</path>
-   	</tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+   	</tag-file> 
    	<tag-file>
-       <name>TabBody</name>
-       <path>/WEB-INF/tags/TabBody.tag</path>
-   	</tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
    	<tag-file>
-       <name>TabBodys</name>
-       <path>/WEB-INF/tags/TabBodys.tag</path>
+	    <name>Alert5</name>
+		<path>/WEB-INF/tags/Alert5.tag</path>
+   	</tag-file> 
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>TabBodyArea</name>
-       <path>/WEB-INF/tags/TabBodyArea.tag</path>
-   	</tag-file>
-   	<tag-file>
-       <name>CKEditor</name>
-       <path>/WEB-INF/tags/CKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   
@@ -281,86 +266,82 @@
        <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Rating</name>
-       <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>    		
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>StyledRating</name>
-       <path>/WEB-INF/tags/StyledRating.tag</path>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>headItems</name>
-       <path>/WEB-INF/tags/headItems.tag</path>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
-   	</tag-file>  
+   	</tag-file> 
    	<tag-file>
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Alert</name>
-		<path>/WEB-INF/tags/Alert.tag</path>
-   	</tag-file>  
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Page</name>
-		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>
+	    <name>errors</name>
+		<path>/WEB-INF/tags/Errors.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>TSTable</name>
-		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>    
-  	<tag-file>
-	    <name>Arrow</name>
-		<path>/WEB-INF/tags/Arrow.tag</path>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>AdvancedAccordian</name>
-       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
-   	</tag-file>  
-   	<tag-file>
-   		<name>RestrictedUsageAccordian</name>
-   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
    	</tag-file>
-  	<tag-file>
-	    <name>SimplePanel</name>
-		<path>/WEB-INF/tags/SimplePanel.tag</path>
-   	</tag-file>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>
    	<tag-file>
+       <name>headItems</name>
+       <path>/WEB-INF/tags/headItems.tag</path>
+   	</tag-file> 
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TextSearch</name>
-		<path>/WEB-INF/tags/TextSearch.tag</path>
-   	</tag-file>  
+       <name>Input</name>
+       <path>/WEB-INF/tags/Input.tag</path>
+   	</tag-file>
    	<tag-file>
+       <name>JSImport</name>
+       <path>/WEB-INF/tags/JSImport.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Notebook</name>
+		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file> 
    	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag-file>
-       <name>Etherpad</name>
-       <path>/WEB-INF/tags/Etherpad.tag</path>
-   	</tag-file> 
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
    	<tag-file>
-	    <name>errors</name>
-		<path>/WEB-INF/tags/Errors.tag</path>
-   	</tag-file> 
-   	<tag-file>
-	    <name>errors5</name>
-		<path>/WEB-INF/tags/Errors5.tag</path>
-   	</tag-file>    
-   	<tag-file>
-	    <name>Widget</name>
-		<path>/WEB-INF/tags/Widget.tag</path>
-   	</tag-file>   
-   	<tag-file>
 	    <name>Page5</name>
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
@@ -369,92 +350,71 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TSTable5</name>
-		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>  
+       <name>Popover</name>
+       <path>/WEB-INF/tags/Popover.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>WaitForLeader</name>
-		<path>/WEB-INF/tags/WaitForLeader.tag</path>
-   	</tag-file>  
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Alert5</name>
-		<path>/WEB-INF/tags/Alert5.tag</path>
-   	</tag-file>  
-   	<tag-file>
-       <name>FileUpload5</name>
-       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
-   	<tag>
-    <name>textarea</name>
-    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
-    <body-content>JSP</body-content>
-    <dynamic-attributes>true</dynamic-attributes>
-    <description>
-    	Render text exactly same as  original input, which even won't escape the input HTML tag.
-    </description>    
-    <attribute>
-        <description>
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>id</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>onchange</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>disabled</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-	<tag-file>
-		<name>head</name>
-	    <path>/WEB-INF/tags/Head.tag</path>
-	</tag-file>
-   	<tag-file>
-       <name>Comments</name>
-       <path>/WEB-INF/tags/Comments.tag</path>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>CommentsAuthor</name>
-       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
+   	</tag-file>    		
+   	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FileUpload</name>
-       <path>/WEB-INF/tags/FileUpload.tag</path>
+       <name>Switch</name>
+       <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>WaitingSpinner</name>
-       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>JSImport</name>
-       <path>/WEB-INF/tags/JSImport.tag</path>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Popover</name>
-       <path>/WEB-INF/tags/Popover.tag</path>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Input</name>
-       <path>/WEB-INF/tags/Input.tag</path>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Switch</name>
-       <path>/WEB-INF/tags/Switch.tag</path>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>TSTable5</name>
+		<path>/WEB-INF/tags/TSTable5.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
    	</tag-file>
+	<tag-file>
+	    <name>Widget</name>
+		<path>/WEB-INF/tags/Widget.tag</path>
+   	</tag-file> 
 </taglib>
\ No newline at end of file
Index: lams_tool_daco/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u
--- lams_tool_daco/web/WEB-INF/tags/Notebook.tag	(revision 0)
+++ lams_tool_daco/web/WEB-INF/tags/Notebook.tag	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -0,0 +1,108 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="instructions" required="true" rtexprvalue="true"%>
+<%@ attribute name="formActionUrl" required="true" rtexprvalue="true"%>
+<%@ attribute name="formModelAttribute" required="false" rtexprvalue="true"%>
+<c:if test="${empty formModelAttribute}">
+	<c:set var="formModelAttribute" value="reflectionForm" />
+</c:if>
+<%@ attribute name="isNextActivityButtonSupported" required="true" rtexprvalue="true"%>
+<%@ attribute name="isLastActivity" required="false" rtexprvalue="true"%>
+<%@ attribute name="hiddenInputs" required="false" rtexprvalue="true"%>
+<c:if test="${empty hiddenInputs}">
+	<c:set var="hiddenInputs" value="userID,sessionMapID" />
+</c:if>
+<%@ attribute name="isNbTool" required="false" rtexprvalue="true"%>
+<c:if test="${empty isNbTool}">
+	<c:set var="isNbTool" value="false" />
+</c:if>
+
+<%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
+<%-- Default value for I18N keys --%> 
+<c:if test="${empty notebookLabelKey}">
+	<c:set var="notebookLabelKey" value="label.notebook" />
+</c:if>
+<c:if test="${empty finishButtonLabelKey}">
+	<c:set var="finishButtonLabelKey" value="label.submit" />
+</c:if>
+<c:if test="${empty nextActivityButtonLabelKey}">
+	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+</c:if>
+
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
+		}
+		function submitForm() {
+			var f = document.getElementById('reflectionForm');
+			f.submit();
+		}
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+	
+	<div id="instructions" class="instructions">
+		<lams:out value="${instructions}" escapeHtml="true" />
+	</div>
+	<hr class="mx-5">
+
+	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
+			<form:hidden path="${hiddenInput}" />
+		</c:forTokens>	
+			
+		<lams:errors5/>
+		
+		<div class="container-lg">
+			<div class="card lcard lcard-no-borders shadow mb-3">
+				<div class="card-header lcard-header-button-border">
+					<fmt:message key="${notebookLabelKey}" />
+				</div>
+				<div class="card-body mb-3">
+					<fmt:message key="${notebookLabelKey}" var="notebookLabel"/>
+					<form:textarea aria-label="${notebookLabel}" aria-multiline="true"
+						aria-required="true" required="true" path="entryText"
+						cssClass="form-control" id="focused" rows="5"></form:textarea>
+				</div>
+			</div>
+	
+			<div class="activity-bottom-buttons">
+				<button name="finishButton" id="finishButton" class="btn btn-primary">
+					<c:choose>
+						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
+							<fmt:message key="${finishButtonLabelKey}" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="${nextActivityButtonLabelKey}" />
+						</c:otherwise>
+					</c:choose>
+				</buttun>
+			</div>
+		
+		</div>
+	</form:form>
+	
+	<c:if test="${isNbTool}">
+		<!-- 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="${toolSessionID}"
+						   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
+						   pageSize="10" sortBy="1" />
+		</c:if>
+		<!-- End comments -->
+	</c:if>
+
+</lams:PageLearner>
\ No newline at end of file
Index: lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r14a43ff0db3bd18db9a56dde9555420f04347c47 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
+++ lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -16,161 +16,123 @@
    </listener>
 
    <tag>
-
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
       <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
       <name>WebAppURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
       </icon>
       <name>help</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Help tag</description>
          <name>module</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>toolSignature</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>page</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>style</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
       </icon>
       <name>Configuration</name>
       <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Get the configuration value for the specified key</description>
          <name>key</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
       <name>LAMSURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
       </icon>
       <name>html</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
          <description>Render html tag with direction and language</description>
          <name>xhtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
       <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
       <name>out</name>
       <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>value</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>escapeHtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts role name into form usable as message resources key</description>
       <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
       <name>role</name>
       <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts role name into form usable as message resources key</description>
          <name>role</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -192,7 +154,6 @@
  	  </attribute>
    </tag>
    <tag>
-
       <description>Output details from the shared session UserDTO object</description>
       <display-name>user details</display-name>
       <icon>    
@@ -205,14 +166,9 @@
          <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
-
-	
 	<tag>
       <description>Small portrait of a user</description>
       <display-name>User Portrait</display-name>
@@ -243,32 +199,61 @@
          <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
       </attribute>
    </tag>
-	
-	<tag-file>
-       <name>Tab</name>
-       <path>/WEB-INF/tags/Tab.tag</path>
-   	</tag-file>
+   <tag>
+	    <name>textarea</name>
+	    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
+	    <body-content>JSP</body-content>
+	    <dynamic-attributes>true</dynamic-attributes>
+	    <description>
+	    	Render text exactly same as  original input, which even won't escape the input HTML tag.
+	    </description>    
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>name</name>
+	        <required>true</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>id</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>onchange</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>disabled</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+  	</tag>
+  	
    	<tag-file>
-       <name>Tabs</name>
-       <path>/WEB-INF/tags/Tabs.tag</path>
-   	</tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+   	</tag-file> 
    	<tag-file>
-       <name>TabBody</name>
-       <path>/WEB-INF/tags/TabBody.tag</path>
-   	</tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
    	<tag-file>
-       <name>TabBodys</name>
-       <path>/WEB-INF/tags/TabBodys.tag</path>
+	    <name>Alert5</name>
+		<path>/WEB-INF/tags/Alert5.tag</path>
+   	</tag-file> 
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>TabBodyArea</name>
-       <path>/WEB-INF/tags/TabBodyArea.tag</path>
-   	</tag-file>
-   	<tag-file>
-       <name>CKEditor</name>
-       <path>/WEB-INF/tags/CKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   
@@ -281,86 +266,82 @@
        <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Rating</name>
-       <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>    		
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>StyledRating</name>
-       <path>/WEB-INF/tags/StyledRating.tag</path>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>headItems</name>
-       <path>/WEB-INF/tags/headItems.tag</path>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
-   	</tag-file>  
+   	</tag-file> 
    	<tag-file>
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Alert</name>
-		<path>/WEB-INF/tags/Alert.tag</path>
-   	</tag-file>  
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Page</name>
-		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>
+	    <name>errors</name>
+		<path>/WEB-INF/tags/Errors.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>TSTable</name>
-		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>    
-  	<tag-file>
-	    <name>Arrow</name>
-		<path>/WEB-INF/tags/Arrow.tag</path>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>AdvancedAccordian</name>
-       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
-   	</tag-file>  
-   	<tag-file>
-   		<name>RestrictedUsageAccordian</name>
-   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
    	</tag-file>
-  	<tag-file>
-	    <name>SimplePanel</name>
-		<path>/WEB-INF/tags/SimplePanel.tag</path>
-   	</tag-file>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>
    	<tag-file>
+       <name>headItems</name>
+       <path>/WEB-INF/tags/headItems.tag</path>
+   	</tag-file> 
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TextSearch</name>
-		<path>/WEB-INF/tags/TextSearch.tag</path>
-   	</tag-file>  
+       <name>Input</name>
+       <path>/WEB-INF/tags/Input.tag</path>
+   	</tag-file>
    	<tag-file>
+       <name>JSImport</name>
+       <path>/WEB-INF/tags/JSImport.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Notebook</name>
+		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file> 
    	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag-file>
-       <name>Etherpad</name>
-       <path>/WEB-INF/tags/Etherpad.tag</path>
-   	</tag-file> 
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
    	<tag-file>
-	    <name>errors</name>
-		<path>/WEB-INF/tags/Errors.tag</path>
-   	</tag-file> 
-   	<tag-file>
-	    <name>errors5</name>
-		<path>/WEB-INF/tags/Errors5.tag</path>
-   	</tag-file>    
-   	<tag-file>
-	    <name>Widget</name>
-		<path>/WEB-INF/tags/Widget.tag</path>
-   	</tag-file>   
-   	<tag-file>
 	    <name>Page5</name>
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
@@ -369,92 +350,71 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TSTable5</name>
-		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>  
+       <name>Popover</name>
+       <path>/WEB-INF/tags/Popover.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>WaitForLeader</name>
-		<path>/WEB-INF/tags/WaitForLeader.tag</path>
-   	</tag-file>  
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Alert5</name>
-		<path>/WEB-INF/tags/Alert5.tag</path>
-   	</tag-file>  
-   	<tag-file>
-       <name>FileUpload5</name>
-       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
-   	<tag>
-    <name>textarea</name>
-    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
-    <body-content>JSP</body-content>
-    <dynamic-attributes>true</dynamic-attributes>
-    <description>
-    	Render text exactly same as  original input, which even won't escape the input HTML tag.
-    </description>    
-    <attribute>
-        <description>
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>id</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>onchange</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>disabled</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-	<tag-file>
-		<name>head</name>
-	    <path>/WEB-INF/tags/Head.tag</path>
-	</tag-file>
-   	<tag-file>
-       <name>Comments</name>
-       <path>/WEB-INF/tags/Comments.tag</path>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>CommentsAuthor</name>
-       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
+   	</tag-file>    		
+   	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FileUpload</name>
-       <path>/WEB-INF/tags/FileUpload.tag</path>
+       <name>Switch</name>
+       <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>WaitingSpinner</name>
-       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>JSImport</name>
-       <path>/WEB-INF/tags/JSImport.tag</path>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Popover</name>
-       <path>/WEB-INF/tags/Popover.tag</path>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Input</name>
-       <path>/WEB-INF/tags/Input.tag</path>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Switch</name>
-       <path>/WEB-INF/tags/Switch.tag</path>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>TSTable5</name>
+		<path>/WEB-INF/tags/TSTable5.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
    	</tag-file>
+	<tag-file>
+	    <name>Widget</name>
+		<path>/WEB-INF/tags/Widget.tag</path>
+   	</tag-file> 
 </taglib>
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u
--- lams_tool_doku/web/WEB-INF/tags/Notebook.tag	(revision 0)
+++ lams_tool_doku/web/WEB-INF/tags/Notebook.tag	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -0,0 +1,108 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="instructions" required="true" rtexprvalue="true"%>
+<%@ attribute name="formActionUrl" required="true" rtexprvalue="true"%>
+<%@ attribute name="formModelAttribute" required="false" rtexprvalue="true"%>
+<c:if test="${empty formModelAttribute}">
+	<c:set var="formModelAttribute" value="reflectionForm" />
+</c:if>
+<%@ attribute name="isNextActivityButtonSupported" required="true" rtexprvalue="true"%>
+<%@ attribute name="isLastActivity" required="false" rtexprvalue="true"%>
+<%@ attribute name="hiddenInputs" required="false" rtexprvalue="true"%>
+<c:if test="${empty hiddenInputs}">
+	<c:set var="hiddenInputs" value="userID,sessionMapID" />
+</c:if>
+<%@ attribute name="isNbTool" required="false" rtexprvalue="true"%>
+<c:if test="${empty isNbTool}">
+	<c:set var="isNbTool" value="false" />
+</c:if>
+
+<%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
+<%-- Default value for I18N keys --%> 
+<c:if test="${empty notebookLabelKey}">
+	<c:set var="notebookLabelKey" value="label.notebook" />
+</c:if>
+<c:if test="${empty finishButtonLabelKey}">
+	<c:set var="finishButtonLabelKey" value="label.submit" />
+</c:if>
+<c:if test="${empty nextActivityButtonLabelKey}">
+	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+</c:if>
+
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
+		}
+		function submitForm() {
+			var f = document.getElementById('reflectionForm');
+			f.submit();
+		}
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+	
+	<div id="instructions" class="instructions">
+		<lams:out value="${instructions}" escapeHtml="true" />
+	</div>
+	<hr class="mx-5">
+
+	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
+			<form:hidden path="${hiddenInput}" />
+		</c:forTokens>	
+			
+		<lams:errors5/>
+		
+		<div class="container-lg">
+			<div class="card lcard lcard-no-borders shadow mb-3">
+				<div class="card-header lcard-header-button-border">
+					<fmt:message key="${notebookLabelKey}" />
+				</div>
+				<div class="card-body mb-3">
+					<fmt:message key="${notebookLabelKey}" var="notebookLabel"/>
+					<form:textarea aria-label="${notebookLabel}" aria-multiline="true"
+						aria-required="true" required="true" path="entryText"
+						cssClass="form-control" id="focused" rows="5"></form:textarea>
+				</div>
+			</div>
+	
+			<div class="activity-bottom-buttons">
+				<button name="finishButton" id="finishButton" class="btn btn-primary">
+					<c:choose>
+						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
+							<fmt:message key="${finishButtonLabelKey}" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="${nextActivityButtonLabelKey}" />
+						</c:otherwise>
+					</c:choose>
+				</buttun>
+			</div>
+		
+		</div>
+	</form:form>
+	
+	<c:if test="${isNbTool}">
+		<!-- 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="${toolSessionID}"
+						   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
+						   pageSize="10" sortBy="1" />
+		</c:if>
+		<!-- End comments -->
+	</c:if>
+
+</lams:PageLearner>
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r14a43ff0db3bd18db9a56dde9555420f04347c47 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_tool_doku/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
+++ lams_tool_doku/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -16,161 +16,123 @@
    </listener>
 
    <tag>
-
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
       <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
       <name>WebAppURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
       </icon>
       <name>help</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Help tag</description>
          <name>module</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>toolSignature</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>page</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>style</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
       </icon>
       <name>Configuration</name>
       <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Get the configuration value for the specified key</description>
          <name>key</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
       <name>LAMSURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
       </icon>
       <name>html</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
          <description>Render html tag with direction and language</description>
          <name>xhtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
       <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
       <name>out</name>
       <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>value</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>escapeHtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts role name into form usable as message resources key</description>
       <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
       <name>role</name>
       <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts role name into form usable as message resources key</description>
          <name>role</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -192,7 +154,6 @@
  	  </attribute>
    </tag>
    <tag>
-
       <description>Output details from the shared session UserDTO object</description>
       <display-name>user details</display-name>
       <icon>    
@@ -205,14 +166,9 @@
          <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
-
-	
 	<tag>
       <description>Small portrait of a user</description>
       <display-name>User Portrait</display-name>
@@ -243,32 +199,61 @@
          <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
       </attribute>
    </tag>
-	
-	<tag-file>
-       <name>Tab</name>
-       <path>/WEB-INF/tags/Tab.tag</path>
-   	</tag-file>
+   <tag>
+	    <name>textarea</name>
+	    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
+	    <body-content>JSP</body-content>
+	    <dynamic-attributes>true</dynamic-attributes>
+	    <description>
+	    	Render text exactly same as  original input, which even won't escape the input HTML tag.
+	    </description>    
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>name</name>
+	        <required>true</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>id</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>onchange</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>disabled</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+  	</tag>
+  	
    	<tag-file>
-       <name>Tabs</name>
-       <path>/WEB-INF/tags/Tabs.tag</path>
-   	</tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+   	</tag-file> 
    	<tag-file>
-       <name>TabBody</name>
-       <path>/WEB-INF/tags/TabBody.tag</path>
-   	</tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
    	<tag-file>
-       <name>TabBodys</name>
-       <path>/WEB-INF/tags/TabBodys.tag</path>
+	    <name>Alert5</name>
+		<path>/WEB-INF/tags/Alert5.tag</path>
+   	</tag-file> 
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>TabBodyArea</name>
-       <path>/WEB-INF/tags/TabBodyArea.tag</path>
-   	</tag-file>
-   	<tag-file>
-       <name>CKEditor</name>
-       <path>/WEB-INF/tags/CKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   
@@ -281,86 +266,82 @@
        <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Rating</name>
-       <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>    		
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>StyledRating</name>
-       <path>/WEB-INF/tags/StyledRating.tag</path>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>headItems</name>
-       <path>/WEB-INF/tags/headItems.tag</path>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
-   	</tag-file>  
+   	</tag-file> 
    	<tag-file>
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Alert</name>
-		<path>/WEB-INF/tags/Alert.tag</path>
-   	</tag-file>  
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Page</name>
-		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>
+	    <name>errors</name>
+		<path>/WEB-INF/tags/Errors.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>TSTable</name>
-		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>    
-  	<tag-file>
-	    <name>Arrow</name>
-		<path>/WEB-INF/tags/Arrow.tag</path>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>AdvancedAccordian</name>
-       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
-   	</tag-file>  
-   	<tag-file>
-   		<name>RestrictedUsageAccordian</name>
-   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
    	</tag-file>
-  	<tag-file>
-	    <name>SimplePanel</name>
-		<path>/WEB-INF/tags/SimplePanel.tag</path>
-   	</tag-file>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>
    	<tag-file>
+       <name>headItems</name>
+       <path>/WEB-INF/tags/headItems.tag</path>
+   	</tag-file> 
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TextSearch</name>
-		<path>/WEB-INF/tags/TextSearch.tag</path>
-   	</tag-file>  
+       <name>Input</name>
+       <path>/WEB-INF/tags/Input.tag</path>
+   	</tag-file>
    	<tag-file>
+       <name>JSImport</name>
+       <path>/WEB-INF/tags/JSImport.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Notebook</name>
+		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file> 
    	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag-file>
-       <name>Etherpad</name>
-       <path>/WEB-INF/tags/Etherpad.tag</path>
-   	</tag-file> 
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
    	<tag-file>
-	    <name>errors</name>
-		<path>/WEB-INF/tags/Errors.tag</path>
-   	</tag-file> 
-   	<tag-file>
-	    <name>errors5</name>
-		<path>/WEB-INF/tags/Errors5.tag</path>
-   	</tag-file>    
-   	<tag-file>
-	    <name>Widget</name>
-		<path>/WEB-INF/tags/Widget.tag</path>
-   	</tag-file>   
-   	<tag-file>
 	    <name>Page5</name>
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
@@ -369,92 +350,71 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TSTable5</name>
-		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>  
+       <name>Popover</name>
+       <path>/WEB-INF/tags/Popover.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>WaitForLeader</name>
-		<path>/WEB-INF/tags/WaitForLeader.tag</path>
-   	</tag-file>  
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Alert5</name>
-		<path>/WEB-INF/tags/Alert5.tag</path>
-   	</tag-file>  
-   	<tag-file>
-       <name>FileUpload5</name>
-       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
-   	<tag>
-    <name>textarea</name>
-    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
-    <body-content>JSP</body-content>
-    <dynamic-attributes>true</dynamic-attributes>
-    <description>
-    	Render text exactly same as  original input, which even won't escape the input HTML tag.
-    </description>    
-    <attribute>
-        <description>
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>id</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>onchange</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>disabled</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-	<tag-file>
-		<name>head</name>
-	    <path>/WEB-INF/tags/Head.tag</path>
-	</tag-file>
-   	<tag-file>
-       <name>Comments</name>
-       <path>/WEB-INF/tags/Comments.tag</path>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>CommentsAuthor</name>
-       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
+   	</tag-file>    		
+   	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FileUpload</name>
-       <path>/WEB-INF/tags/FileUpload.tag</path>
+       <name>Switch</name>
+       <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>WaitingSpinner</name>
-       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>JSImport</name>
-       <path>/WEB-INF/tags/JSImport.tag</path>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Popover</name>
-       <path>/WEB-INF/tags/Popover.tag</path>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Input</name>
-       <path>/WEB-INF/tags/Input.tag</path>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Switch</name>
-       <path>/WEB-INF/tags/Switch.tag</path>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>TSTable5</name>
+		<path>/WEB-INF/tags/TSTable5.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
    	</tag-file>
+	<tag-file>
+	    <name>Widget</name>
+		<path>/WEB-INF/tags/Widget.tag</path>
+   	</tag-file> 
 </taglib>
\ No newline at end of file
Index: lams_tool_forum/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u
--- lams_tool_forum/web/WEB-INF/tags/Notebook.tag	(revision 0)
+++ lams_tool_forum/web/WEB-INF/tags/Notebook.tag	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -0,0 +1,108 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="instructions" required="true" rtexprvalue="true"%>
+<%@ attribute name="formActionUrl" required="true" rtexprvalue="true"%>
+<%@ attribute name="formModelAttribute" required="false" rtexprvalue="true"%>
+<c:if test="${empty formModelAttribute}">
+	<c:set var="formModelAttribute" value="reflectionForm" />
+</c:if>
+<%@ attribute name="isNextActivityButtonSupported" required="true" rtexprvalue="true"%>
+<%@ attribute name="isLastActivity" required="false" rtexprvalue="true"%>
+<%@ attribute name="hiddenInputs" required="false" rtexprvalue="true"%>
+<c:if test="${empty hiddenInputs}">
+	<c:set var="hiddenInputs" value="userID,sessionMapID" />
+</c:if>
+<%@ attribute name="isNbTool" required="false" rtexprvalue="true"%>
+<c:if test="${empty isNbTool}">
+	<c:set var="isNbTool" value="false" />
+</c:if>
+
+<%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
+<%-- Default value for I18N keys --%> 
+<c:if test="${empty notebookLabelKey}">
+	<c:set var="notebookLabelKey" value="label.notebook" />
+</c:if>
+<c:if test="${empty finishButtonLabelKey}">
+	<c:set var="finishButtonLabelKey" value="label.submit" />
+</c:if>
+<c:if test="${empty nextActivityButtonLabelKey}">
+	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+</c:if>
+
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
+		}
+		function submitForm() {
+			var f = document.getElementById('reflectionForm');
+			f.submit();
+		}
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+	
+	<div id="instructions" class="instructions">
+		<lams:out value="${instructions}" escapeHtml="true" />
+	</div>
+	<hr class="mx-5">
+
+	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
+			<form:hidden path="${hiddenInput}" />
+		</c:forTokens>	
+			
+		<lams:errors5/>
+		
+		<div class="container-lg">
+			<div class="card lcard lcard-no-borders shadow mb-3">
+				<div class="card-header lcard-header-button-border">
+					<fmt:message key="${notebookLabelKey}" />
+				</div>
+				<div class="card-body mb-3">
+					<fmt:message key="${notebookLabelKey}" var="notebookLabel"/>
+					<form:textarea aria-label="${notebookLabel}" aria-multiline="true"
+						aria-required="true" required="true" path="entryText"
+						cssClass="form-control" id="focused" rows="5"></form:textarea>
+				</div>
+			</div>
+	
+			<div class="activity-bottom-buttons">
+				<button name="finishButton" id="finishButton" class="btn btn-primary">
+					<c:choose>
+						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
+							<fmt:message key="${finishButtonLabelKey}" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="${nextActivityButtonLabelKey}" />
+						</c:otherwise>
+					</c:choose>
+				</buttun>
+			</div>
+		
+		</div>
+	</form:form>
+	
+	<c:if test="${isNbTool}">
+		<!-- 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="${toolSessionID}"
+						   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
+						   pageSize="10" sortBy="1" />
+		</c:if>
+		<!-- End comments -->
+	</c:if>
+
+</lams:PageLearner>
\ No newline at end of file
Index: lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r14a43ff0db3bd18db9a56dde9555420f04347c47 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
+++ lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -16,161 +16,123 @@
    </listener>
 
    <tag>
-
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
       <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
       <name>WebAppURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
       </icon>
       <name>help</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Help tag</description>
          <name>module</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>toolSignature</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>page</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>style</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
       </icon>
       <name>Configuration</name>
       <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Get the configuration value for the specified key</description>
          <name>key</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
       <name>LAMSURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
       </icon>
       <name>html</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
          <description>Render html tag with direction and language</description>
          <name>xhtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
       <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
       <name>out</name>
       <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>value</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>escapeHtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts role name into form usable as message resources key</description>
       <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
       <name>role</name>
       <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts role name into form usable as message resources key</description>
          <name>role</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -192,7 +154,6 @@
  	  </attribute>
    </tag>
    <tag>
-
       <description>Output details from the shared session UserDTO object</description>
       <display-name>user details</display-name>
       <icon>    
@@ -205,14 +166,9 @@
          <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
-
-	
 	<tag>
       <description>Small portrait of a user</description>
       <display-name>User Portrait</display-name>
@@ -243,32 +199,61 @@
          <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
       </attribute>
    </tag>
-	
-	<tag-file>
-       <name>Tab</name>
-       <path>/WEB-INF/tags/Tab.tag</path>
-   	</tag-file>
+   <tag>
+	    <name>textarea</name>
+	    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
+	    <body-content>JSP</body-content>
+	    <dynamic-attributes>true</dynamic-attributes>
+	    <description>
+	    	Render text exactly same as  original input, which even won't escape the input HTML tag.
+	    </description>    
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>name</name>
+	        <required>true</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>id</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>onchange</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>disabled</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+  	</tag>
+  	
    	<tag-file>
-       <name>Tabs</name>
-       <path>/WEB-INF/tags/Tabs.tag</path>
-   	</tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+   	</tag-file> 
    	<tag-file>
-       <name>TabBody</name>
-       <path>/WEB-INF/tags/TabBody.tag</path>
-   	</tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
    	<tag-file>
-       <name>TabBodys</name>
-       <path>/WEB-INF/tags/TabBodys.tag</path>
+	    <name>Alert5</name>
+		<path>/WEB-INF/tags/Alert5.tag</path>
+   	</tag-file> 
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>TabBodyArea</name>
-       <path>/WEB-INF/tags/TabBodyArea.tag</path>
-   	</tag-file>
-   	<tag-file>
-       <name>CKEditor</name>
-       <path>/WEB-INF/tags/CKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   
@@ -281,86 +266,82 @@
        <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Rating</name>
-       <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>    		
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>StyledRating</name>
-       <path>/WEB-INF/tags/StyledRating.tag</path>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>headItems</name>
-       <path>/WEB-INF/tags/headItems.tag</path>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
-   	</tag-file>  
+   	</tag-file> 
    	<tag-file>
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Alert</name>
-		<path>/WEB-INF/tags/Alert.tag</path>
-   	</tag-file>  
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Page</name>
-		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>
+	    <name>errors</name>
+		<path>/WEB-INF/tags/Errors.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>TSTable</name>
-		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>    
-  	<tag-file>
-	    <name>Arrow</name>
-		<path>/WEB-INF/tags/Arrow.tag</path>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>AdvancedAccordian</name>
-       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
-   	</tag-file>  
-   	<tag-file>
-   		<name>RestrictedUsageAccordian</name>
-   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
    	</tag-file>
-  	<tag-file>
-	    <name>SimplePanel</name>
-		<path>/WEB-INF/tags/SimplePanel.tag</path>
-   	</tag-file>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>
    	<tag-file>
+       <name>headItems</name>
+       <path>/WEB-INF/tags/headItems.tag</path>
+   	</tag-file> 
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TextSearch</name>
-		<path>/WEB-INF/tags/TextSearch.tag</path>
-   	</tag-file>  
+       <name>Input</name>
+       <path>/WEB-INF/tags/Input.tag</path>
+   	</tag-file>
    	<tag-file>
+       <name>JSImport</name>
+       <path>/WEB-INF/tags/JSImport.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Notebook</name>
+		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file> 
    	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag-file>
-       <name>Etherpad</name>
-       <path>/WEB-INF/tags/Etherpad.tag</path>
-   	</tag-file> 
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
    	<tag-file>
-	    <name>errors</name>
-		<path>/WEB-INF/tags/Errors.tag</path>
-   	</tag-file> 
-   	<tag-file>
-	    <name>errors5</name>
-		<path>/WEB-INF/tags/Errors5.tag</path>
-   	</tag-file>    
-   	<tag-file>
-	    <name>Widget</name>
-		<path>/WEB-INF/tags/Widget.tag</path>
-   	</tag-file>   
-   	<tag-file>
 	    <name>Page5</name>
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
@@ -369,92 +350,71 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TSTable5</name>
-		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>  
+       <name>Popover</name>
+       <path>/WEB-INF/tags/Popover.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>WaitForLeader</name>
-		<path>/WEB-INF/tags/WaitForLeader.tag</path>
-   	</tag-file>  
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Alert5</name>
-		<path>/WEB-INF/tags/Alert5.tag</path>
-   	</tag-file>  
-   	<tag-file>
-       <name>FileUpload5</name>
-       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
-   	<tag>
-    <name>textarea</name>
-    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
-    <body-content>JSP</body-content>
-    <dynamic-attributes>true</dynamic-attributes>
-    <description>
-    	Render text exactly same as  original input, which even won't escape the input HTML tag.
-    </description>    
-    <attribute>
-        <description>
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>id</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>onchange</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>disabled</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-	<tag-file>
-		<name>head</name>
-	    <path>/WEB-INF/tags/Head.tag</path>
-	</tag-file>
-   	<tag-file>
-       <name>Comments</name>
-       <path>/WEB-INF/tags/Comments.tag</path>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>CommentsAuthor</name>
-       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
+   	</tag-file>    		
+   	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FileUpload</name>
-       <path>/WEB-INF/tags/FileUpload.tag</path>
+       <name>Switch</name>
+       <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>WaitingSpinner</name>
-       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>JSImport</name>
-       <path>/WEB-INF/tags/JSImport.tag</path>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Popover</name>
-       <path>/WEB-INF/tags/Popover.tag</path>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Input</name>
-       <path>/WEB-INF/tags/Input.tag</path>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Switch</name>
-       <path>/WEB-INF/tags/Switch.tag</path>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>TSTable5</name>
+		<path>/WEB-INF/tags/TSTable5.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
    	</tag-file>
+	<tag-file>
+	    <name>Widget</name>
+		<path>/WEB-INF/tags/Widget.tag</path>
+   	</tag-file> 
 </taglib>
\ No newline at end of file
Index: lams_tool_gmap/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u
--- lams_tool_gmap/web/WEB-INF/tags/Notebook.tag	(revision 0)
+++ lams_tool_gmap/web/WEB-INF/tags/Notebook.tag	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -0,0 +1,108 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="instructions" required="true" rtexprvalue="true"%>
+<%@ attribute name="formActionUrl" required="true" rtexprvalue="true"%>
+<%@ attribute name="formModelAttribute" required="false" rtexprvalue="true"%>
+<c:if test="${empty formModelAttribute}">
+	<c:set var="formModelAttribute" value="reflectionForm" />
+</c:if>
+<%@ attribute name="isNextActivityButtonSupported" required="true" rtexprvalue="true"%>
+<%@ attribute name="isLastActivity" required="false" rtexprvalue="true"%>
+<%@ attribute name="hiddenInputs" required="false" rtexprvalue="true"%>
+<c:if test="${empty hiddenInputs}">
+	<c:set var="hiddenInputs" value="userID,sessionMapID" />
+</c:if>
+<%@ attribute name="isNbTool" required="false" rtexprvalue="true"%>
+<c:if test="${empty isNbTool}">
+	<c:set var="isNbTool" value="false" />
+</c:if>
+
+<%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
+<%-- Default value for I18N keys --%> 
+<c:if test="${empty notebookLabelKey}">
+	<c:set var="notebookLabelKey" value="label.notebook" />
+</c:if>
+<c:if test="${empty finishButtonLabelKey}">
+	<c:set var="finishButtonLabelKey" value="label.submit" />
+</c:if>
+<c:if test="${empty nextActivityButtonLabelKey}">
+	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+</c:if>
+
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
+		}
+		function submitForm() {
+			var f = document.getElementById('reflectionForm');
+			f.submit();
+		}
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+	
+	<div id="instructions" class="instructions">
+		<lams:out value="${instructions}" escapeHtml="true" />
+	</div>
+	<hr class="mx-5">
+
+	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
+			<form:hidden path="${hiddenInput}" />
+		</c:forTokens>	
+			
+		<lams:errors5/>
+		
+		<div class="container-lg">
+			<div class="card lcard lcard-no-borders shadow mb-3">
+				<div class="card-header lcard-header-button-border">
+					<fmt:message key="${notebookLabelKey}" />
+				</div>
+				<div class="card-body mb-3">
+					<fmt:message key="${notebookLabelKey}" var="notebookLabel"/>
+					<form:textarea aria-label="${notebookLabel}" aria-multiline="true"
+						aria-required="true" required="true" path="entryText"
+						cssClass="form-control" id="focused" rows="5"></form:textarea>
+				</div>
+			</div>
+	
+			<div class="activity-bottom-buttons">
+				<button name="finishButton" id="finishButton" class="btn btn-primary">
+					<c:choose>
+						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
+							<fmt:message key="${finishButtonLabelKey}" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="${nextActivityButtonLabelKey}" />
+						</c:otherwise>
+					</c:choose>
+				</buttun>
+			</div>
+		
+		</div>
+	</form:form>
+	
+	<c:if test="${isNbTool}">
+		<!-- 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="${toolSessionID}"
+						   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
+						   pageSize="10" sortBy="1" />
+		</c:if>
+		<!-- End comments -->
+	</c:if>
+
+</lams:PageLearner>
\ No newline at end of file
Index: lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r14a43ff0db3bd18db9a56dde9555420f04347c47 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
+++ lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -16,161 +16,123 @@
    </listener>
 
    <tag>
-
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
       <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
       <name>WebAppURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
       </icon>
       <name>help</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Help tag</description>
          <name>module</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>toolSignature</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>page</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>style</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
       </icon>
       <name>Configuration</name>
       <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Get the configuration value for the specified key</description>
          <name>key</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
       <name>LAMSURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
       </icon>
       <name>html</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
          <description>Render html tag with direction and language</description>
          <name>xhtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
       <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
       <name>out</name>
       <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>value</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>escapeHtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts role name into form usable as message resources key</description>
       <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
       <name>role</name>
       <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts role name into form usable as message resources key</description>
          <name>role</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -192,7 +154,6 @@
  	  </attribute>
    </tag>
    <tag>
-
       <description>Output details from the shared session UserDTO object</description>
       <display-name>user details</display-name>
       <icon>    
@@ -205,14 +166,9 @@
          <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
-
-	
 	<tag>
       <description>Small portrait of a user</description>
       <display-name>User Portrait</display-name>
@@ -243,32 +199,61 @@
          <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
       </attribute>
    </tag>
-	
-	<tag-file>
-       <name>Tab</name>
-       <path>/WEB-INF/tags/Tab.tag</path>
-   	</tag-file>
+   <tag>
+	    <name>textarea</name>
+	    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
+	    <body-content>JSP</body-content>
+	    <dynamic-attributes>true</dynamic-attributes>
+	    <description>
+	    	Render text exactly same as  original input, which even won't escape the input HTML tag.
+	    </description>    
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>name</name>
+	        <required>true</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>id</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>onchange</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>disabled</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+  	</tag>
+  	
    	<tag-file>
-       <name>Tabs</name>
-       <path>/WEB-INF/tags/Tabs.tag</path>
-   	</tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+   	</tag-file> 
    	<tag-file>
-       <name>TabBody</name>
-       <path>/WEB-INF/tags/TabBody.tag</path>
-   	</tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
    	<tag-file>
-       <name>TabBodys</name>
-       <path>/WEB-INF/tags/TabBodys.tag</path>
+	    <name>Alert5</name>
+		<path>/WEB-INF/tags/Alert5.tag</path>
+   	</tag-file> 
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>TabBodyArea</name>
-       <path>/WEB-INF/tags/TabBodyArea.tag</path>
-   	</tag-file>
-   	<tag-file>
-       <name>CKEditor</name>
-       <path>/WEB-INF/tags/CKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   
@@ -281,86 +266,82 @@
        <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Rating</name>
-       <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>    		
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>StyledRating</name>
-       <path>/WEB-INF/tags/StyledRating.tag</path>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>headItems</name>
-       <path>/WEB-INF/tags/headItems.tag</path>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
-   	</tag-file>  
+   	</tag-file> 
    	<tag-file>
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Alert</name>
-		<path>/WEB-INF/tags/Alert.tag</path>
-   	</tag-file>  
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Page</name>
-		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>
+	    <name>errors</name>
+		<path>/WEB-INF/tags/Errors.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>TSTable</name>
-		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>    
-  	<tag-file>
-	    <name>Arrow</name>
-		<path>/WEB-INF/tags/Arrow.tag</path>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>AdvancedAccordian</name>
-       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
-   	</tag-file>  
-   	<tag-file>
-   		<name>RestrictedUsageAccordian</name>
-   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
    	</tag-file>
-  	<tag-file>
-	    <name>SimplePanel</name>
-		<path>/WEB-INF/tags/SimplePanel.tag</path>
-   	</tag-file>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>
    	<tag-file>
+       <name>headItems</name>
+       <path>/WEB-INF/tags/headItems.tag</path>
+   	</tag-file> 
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TextSearch</name>
-		<path>/WEB-INF/tags/TextSearch.tag</path>
-   	</tag-file>  
+       <name>Input</name>
+       <path>/WEB-INF/tags/Input.tag</path>
+   	</tag-file>
    	<tag-file>
+       <name>JSImport</name>
+       <path>/WEB-INF/tags/JSImport.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Notebook</name>
+		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file> 
    	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag-file>
-       <name>Etherpad</name>
-       <path>/WEB-INF/tags/Etherpad.tag</path>
-   	</tag-file> 
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
    	<tag-file>
-	    <name>errors</name>
-		<path>/WEB-INF/tags/Errors.tag</path>
-   	</tag-file> 
-   	<tag-file>
-	    <name>errors5</name>
-		<path>/WEB-INF/tags/Errors5.tag</path>
-   	</tag-file>    
-   	<tag-file>
-	    <name>Widget</name>
-		<path>/WEB-INF/tags/Widget.tag</path>
-   	</tag-file>   
-   	<tag-file>
 	    <name>Page5</name>
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
@@ -369,92 +350,71 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TSTable5</name>
-		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>  
+       <name>Popover</name>
+       <path>/WEB-INF/tags/Popover.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>WaitForLeader</name>
-		<path>/WEB-INF/tags/WaitForLeader.tag</path>
-   	</tag-file>  
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Alert5</name>
-		<path>/WEB-INF/tags/Alert5.tag</path>
-   	</tag-file>  
-   	<tag-file>
-       <name>FileUpload5</name>
-       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
-   	<tag>
-    <name>textarea</name>
-    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
-    <body-content>JSP</body-content>
-    <dynamic-attributes>true</dynamic-attributes>
-    <description>
-    	Render text exactly same as  original input, which even won't escape the input HTML tag.
-    </description>    
-    <attribute>
-        <description>
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>id</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>onchange</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>disabled</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-	<tag-file>
-		<name>head</name>
-	    <path>/WEB-INF/tags/Head.tag</path>
-	</tag-file>
-   	<tag-file>
-       <name>Comments</name>
-       <path>/WEB-INF/tags/Comments.tag</path>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>CommentsAuthor</name>
-       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
+   	</tag-file>    		
+   	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FileUpload</name>
-       <path>/WEB-INF/tags/FileUpload.tag</path>
+       <name>Switch</name>
+       <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>WaitingSpinner</name>
-       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>JSImport</name>
-       <path>/WEB-INF/tags/JSImport.tag</path>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Popover</name>
-       <path>/WEB-INF/tags/Popover.tag</path>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Input</name>
-       <path>/WEB-INF/tags/Input.tag</path>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Switch</name>
-       <path>/WEB-INF/tags/Switch.tag</path>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>TSTable5</name>
+		<path>/WEB-INF/tags/TSTable5.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
    	</tag-file>
+	<tag-file>
+	    <name>Widget</name>
+		<path>/WEB-INF/tags/Widget.tag</path>
+   	</tag-file> 
 </taglib>
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u
--- lams_tool_images/web/WEB-INF/tags/Notebook.tag	(revision 0)
+++ lams_tool_images/web/WEB-INF/tags/Notebook.tag	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -0,0 +1,108 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="instructions" required="true" rtexprvalue="true"%>
+<%@ attribute name="formActionUrl" required="true" rtexprvalue="true"%>
+<%@ attribute name="formModelAttribute" required="false" rtexprvalue="true"%>
+<c:if test="${empty formModelAttribute}">
+	<c:set var="formModelAttribute" value="reflectionForm" />
+</c:if>
+<%@ attribute name="isNextActivityButtonSupported" required="true" rtexprvalue="true"%>
+<%@ attribute name="isLastActivity" required="false" rtexprvalue="true"%>
+<%@ attribute name="hiddenInputs" required="false" rtexprvalue="true"%>
+<c:if test="${empty hiddenInputs}">
+	<c:set var="hiddenInputs" value="userID,sessionMapID" />
+</c:if>
+<%@ attribute name="isNbTool" required="false" rtexprvalue="true"%>
+<c:if test="${empty isNbTool}">
+	<c:set var="isNbTool" value="false" />
+</c:if>
+
+<%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
+<%-- Default value for I18N keys --%> 
+<c:if test="${empty notebookLabelKey}">
+	<c:set var="notebookLabelKey" value="label.notebook" />
+</c:if>
+<c:if test="${empty finishButtonLabelKey}">
+	<c:set var="finishButtonLabelKey" value="label.submit" />
+</c:if>
+<c:if test="${empty nextActivityButtonLabelKey}">
+	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+</c:if>
+
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
+		}
+		function submitForm() {
+			var f = document.getElementById('reflectionForm');
+			f.submit();
+		}
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+	
+	<div id="instructions" class="instructions">
+		<lams:out value="${instructions}" escapeHtml="true" />
+	</div>
+	<hr class="mx-5">
+
+	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
+			<form:hidden path="${hiddenInput}" />
+		</c:forTokens>	
+			
+		<lams:errors5/>
+		
+		<div class="container-lg">
+			<div class="card lcard lcard-no-borders shadow mb-3">
+				<div class="card-header lcard-header-button-border">
+					<fmt:message key="${notebookLabelKey}" />
+				</div>
+				<div class="card-body mb-3">
+					<fmt:message key="${notebookLabelKey}" var="notebookLabel"/>
+					<form:textarea aria-label="${notebookLabel}" aria-multiline="true"
+						aria-required="true" required="true" path="entryText"
+						cssClass="form-control" id="focused" rows="5"></form:textarea>
+				</div>
+			</div>
+	
+			<div class="activity-bottom-buttons">
+				<button name="finishButton" id="finishButton" class="btn btn-primary">
+					<c:choose>
+						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
+							<fmt:message key="${finishButtonLabelKey}" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="${nextActivityButtonLabelKey}" />
+						</c:otherwise>
+					</c:choose>
+				</buttun>
+			</div>
+		
+		</div>
+	</form:form>
+	
+	<c:if test="${isNbTool}">
+		<!-- 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="${toolSessionID}"
+						   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
+						   pageSize="10" sortBy="1" />
+		</c:if>
+		<!-- End comments -->
+	</c:if>
+
+</lams:PageLearner>
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r14a43ff0db3bd18db9a56dde9555420f04347c47 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_tool_images/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
+++ lams_tool_images/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -16,161 +16,123 @@
    </listener>
 
    <tag>
-
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
       <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
       <name>WebAppURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
       </icon>
       <name>help</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Help tag</description>
          <name>module</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>toolSignature</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>page</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>style</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
       </icon>
       <name>Configuration</name>
       <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Get the configuration value for the specified key</description>
          <name>key</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
       <name>LAMSURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
       </icon>
       <name>html</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
          <description>Render html tag with direction and language</description>
          <name>xhtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
       <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
       <name>out</name>
       <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>value</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>escapeHtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts role name into form usable as message resources key</description>
       <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
       <name>role</name>
       <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts role name into form usable as message resources key</description>
          <name>role</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -192,7 +154,6 @@
  	  </attribute>
    </tag>
    <tag>
-
       <description>Output details from the shared session UserDTO object</description>
       <display-name>user details</display-name>
       <icon>    
@@ -205,14 +166,9 @@
          <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
-
-	
 	<tag>
       <description>Small portrait of a user</description>
       <display-name>User Portrait</display-name>
@@ -243,32 +199,61 @@
          <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
       </attribute>
    </tag>
-	
-	<tag-file>
-       <name>Tab</name>
-       <path>/WEB-INF/tags/Tab.tag</path>
-   	</tag-file>
+   <tag>
+	    <name>textarea</name>
+	    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
+	    <body-content>JSP</body-content>
+	    <dynamic-attributes>true</dynamic-attributes>
+	    <description>
+	    	Render text exactly same as  original input, which even won't escape the input HTML tag.
+	    </description>    
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>name</name>
+	        <required>true</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>id</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>onchange</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>disabled</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+  	</tag>
+  	
    	<tag-file>
-       <name>Tabs</name>
-       <path>/WEB-INF/tags/Tabs.tag</path>
-   	</tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+   	</tag-file> 
    	<tag-file>
-       <name>TabBody</name>
-       <path>/WEB-INF/tags/TabBody.tag</path>
-   	</tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
    	<tag-file>
-       <name>TabBodys</name>
-       <path>/WEB-INF/tags/TabBodys.tag</path>
+	    <name>Alert5</name>
+		<path>/WEB-INF/tags/Alert5.tag</path>
+   	</tag-file> 
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>TabBodyArea</name>
-       <path>/WEB-INF/tags/TabBodyArea.tag</path>
-   	</tag-file>
-   	<tag-file>
-       <name>CKEditor</name>
-       <path>/WEB-INF/tags/CKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   
@@ -281,86 +266,82 @@
        <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Rating</name>
-       <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>    		
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>StyledRating</name>
-       <path>/WEB-INF/tags/StyledRating.tag</path>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>headItems</name>
-       <path>/WEB-INF/tags/headItems.tag</path>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
-   	</tag-file>  
+   	</tag-file> 
    	<tag-file>
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Alert</name>
-		<path>/WEB-INF/tags/Alert.tag</path>
-   	</tag-file>  
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Page</name>
-		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>
+	    <name>errors</name>
+		<path>/WEB-INF/tags/Errors.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>TSTable</name>
-		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>    
-  	<tag-file>
-	    <name>Arrow</name>
-		<path>/WEB-INF/tags/Arrow.tag</path>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>AdvancedAccordian</name>
-       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
-   	</tag-file>  
-   	<tag-file>
-   		<name>RestrictedUsageAccordian</name>
-   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
    	</tag-file>
-  	<tag-file>
-	    <name>SimplePanel</name>
-		<path>/WEB-INF/tags/SimplePanel.tag</path>
-   	</tag-file>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>
    	<tag-file>
+       <name>headItems</name>
+       <path>/WEB-INF/tags/headItems.tag</path>
+   	</tag-file> 
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TextSearch</name>
-		<path>/WEB-INF/tags/TextSearch.tag</path>
-   	</tag-file>  
+       <name>Input</name>
+       <path>/WEB-INF/tags/Input.tag</path>
+   	</tag-file>
    	<tag-file>
+       <name>JSImport</name>
+       <path>/WEB-INF/tags/JSImport.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Notebook</name>
+		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file> 
    	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag-file>
-       <name>Etherpad</name>
-       <path>/WEB-INF/tags/Etherpad.tag</path>
-   	</tag-file> 
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
    	<tag-file>
-	    <name>errors</name>
-		<path>/WEB-INF/tags/Errors.tag</path>
-   	</tag-file> 
-   	<tag-file>
-	    <name>errors5</name>
-		<path>/WEB-INF/tags/Errors5.tag</path>
-   	</tag-file>    
-   	<tag-file>
-	    <name>Widget</name>
-		<path>/WEB-INF/tags/Widget.tag</path>
-   	</tag-file>   
-   	<tag-file>
 	    <name>Page5</name>
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
@@ -369,92 +350,71 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TSTable5</name>
-		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>  
+       <name>Popover</name>
+       <path>/WEB-INF/tags/Popover.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>WaitForLeader</name>
-		<path>/WEB-INF/tags/WaitForLeader.tag</path>
-   	</tag-file>  
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Alert5</name>
-		<path>/WEB-INF/tags/Alert5.tag</path>
-   	</tag-file>  
-   	<tag-file>
-       <name>FileUpload5</name>
-       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
-   	<tag>
-    <name>textarea</name>
-    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
-    <body-content>JSP</body-content>
-    <dynamic-attributes>true</dynamic-attributes>
-    <description>
-    	Render text exactly same as  original input, which even won't escape the input HTML tag.
-    </description>    
-    <attribute>
-        <description>
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>id</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>onchange</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>disabled</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-	<tag-file>
-		<name>head</name>
-	    <path>/WEB-INF/tags/Head.tag</path>
-	</tag-file>
-   	<tag-file>
-       <name>Comments</name>
-       <path>/WEB-INF/tags/Comments.tag</path>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>CommentsAuthor</name>
-       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
+   	</tag-file>    		
+   	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FileUpload</name>
-       <path>/WEB-INF/tags/FileUpload.tag</path>
+       <name>Switch</name>
+       <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>WaitingSpinner</name>
-       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>JSImport</name>
-       <path>/WEB-INF/tags/JSImport.tag</path>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Popover</name>
-       <path>/WEB-INF/tags/Popover.tag</path>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Input</name>
-       <path>/WEB-INF/tags/Input.tag</path>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Switch</name>
-       <path>/WEB-INF/tags/Switch.tag</path>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>TSTable5</name>
+		<path>/WEB-INF/tags/TSTable5.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
    	</tag-file>
+	<tag-file>
+	    <name>Widget</name>
+		<path>/WEB-INF/tags/Widget.tag</path>
+   	</tag-file> 
 </taglib>
\ No newline at end of file
Index: lams_tool_imscc/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u
--- lams_tool_imscc/web/WEB-INF/tags/Notebook.tag	(revision 0)
+++ lams_tool_imscc/web/WEB-INF/tags/Notebook.tag	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -0,0 +1,108 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="instructions" required="true" rtexprvalue="true"%>
+<%@ attribute name="formActionUrl" required="true" rtexprvalue="true"%>
+<%@ attribute name="formModelAttribute" required="false" rtexprvalue="true"%>
+<c:if test="${empty formModelAttribute}">
+	<c:set var="formModelAttribute" value="reflectionForm" />
+</c:if>
+<%@ attribute name="isNextActivityButtonSupported" required="true" rtexprvalue="true"%>
+<%@ attribute name="isLastActivity" required="false" rtexprvalue="true"%>
+<%@ attribute name="hiddenInputs" required="false" rtexprvalue="true"%>
+<c:if test="${empty hiddenInputs}">
+	<c:set var="hiddenInputs" value="userID,sessionMapID" />
+</c:if>
+<%@ attribute name="isNbTool" required="false" rtexprvalue="true"%>
+<c:if test="${empty isNbTool}">
+	<c:set var="isNbTool" value="false" />
+</c:if>
+
+<%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
+<%-- Default value for I18N keys --%> 
+<c:if test="${empty notebookLabelKey}">
+	<c:set var="notebookLabelKey" value="label.notebook" />
+</c:if>
+<c:if test="${empty finishButtonLabelKey}">
+	<c:set var="finishButtonLabelKey" value="label.submit" />
+</c:if>
+<c:if test="${empty nextActivityButtonLabelKey}">
+	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+</c:if>
+
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
+		}
+		function submitForm() {
+			var f = document.getElementById('reflectionForm');
+			f.submit();
+		}
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+	
+	<div id="instructions" class="instructions">
+		<lams:out value="${instructions}" escapeHtml="true" />
+	</div>
+	<hr class="mx-5">
+
+	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
+			<form:hidden path="${hiddenInput}" />
+		</c:forTokens>	
+			
+		<lams:errors5/>
+		
+		<div class="container-lg">
+			<div class="card lcard lcard-no-borders shadow mb-3">
+				<div class="card-header lcard-header-button-border">
+					<fmt:message key="${notebookLabelKey}" />
+				</div>
+				<div class="card-body mb-3">
+					<fmt:message key="${notebookLabelKey}" var="notebookLabel"/>
+					<form:textarea aria-label="${notebookLabel}" aria-multiline="true"
+						aria-required="true" required="true" path="entryText"
+						cssClass="form-control" id="focused" rows="5"></form:textarea>
+				</div>
+			</div>
+	
+			<div class="activity-bottom-buttons">
+				<button name="finishButton" id="finishButton" class="btn btn-primary">
+					<c:choose>
+						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
+							<fmt:message key="${finishButtonLabelKey}" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="${nextActivityButtonLabelKey}" />
+						</c:otherwise>
+					</c:choose>
+				</buttun>
+			</div>
+		
+		</div>
+	</form:form>
+	
+	<c:if test="${isNbTool}">
+		<!-- 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="${toolSessionID}"
+						   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
+						   pageSize="10" sortBy="1" />
+		</c:if>
+		<!-- End comments -->
+	</c:if>
+
+</lams:PageLearner>
\ No newline at end of file
Index: lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r14a43ff0db3bd18db9a56dde9555420f04347c47 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
+++ lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -16,161 +16,123 @@
    </listener>
 
    <tag>
-
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
       <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
       <name>WebAppURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
       </icon>
       <name>help</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Help tag</description>
          <name>module</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>toolSignature</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>page</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>style</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
       </icon>
       <name>Configuration</name>
       <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Get the configuration value for the specified key</description>
          <name>key</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
       <name>LAMSURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
       </icon>
       <name>html</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
          <description>Render html tag with direction and language</description>
          <name>xhtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
       <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
       <name>out</name>
       <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>value</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>escapeHtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts role name into form usable as message resources key</description>
       <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
       <name>role</name>
       <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts role name into form usable as message resources key</description>
          <name>role</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -192,7 +154,6 @@
  	  </attribute>
    </tag>
    <tag>
-
       <description>Output details from the shared session UserDTO object</description>
       <display-name>user details</display-name>
       <icon>    
@@ -205,14 +166,9 @@
          <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
-
-	
 	<tag>
       <description>Small portrait of a user</description>
       <display-name>User Portrait</display-name>
@@ -243,32 +199,61 @@
          <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
       </attribute>
    </tag>
-	
-	<tag-file>
-       <name>Tab</name>
-       <path>/WEB-INF/tags/Tab.tag</path>
-   	</tag-file>
+   <tag>
+	    <name>textarea</name>
+	    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
+	    <body-content>JSP</body-content>
+	    <dynamic-attributes>true</dynamic-attributes>
+	    <description>
+	    	Render text exactly same as  original input, which even won't escape the input HTML tag.
+	    </description>    
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>name</name>
+	        <required>true</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>id</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>onchange</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>disabled</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+  	</tag>
+  	
    	<tag-file>
-       <name>Tabs</name>
-       <path>/WEB-INF/tags/Tabs.tag</path>
-   	</tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+   	</tag-file> 
    	<tag-file>
-       <name>TabBody</name>
-       <path>/WEB-INF/tags/TabBody.tag</path>
-   	</tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
    	<tag-file>
-       <name>TabBodys</name>
-       <path>/WEB-INF/tags/TabBodys.tag</path>
+	    <name>Alert5</name>
+		<path>/WEB-INF/tags/Alert5.tag</path>
+   	</tag-file> 
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>TabBodyArea</name>
-       <path>/WEB-INF/tags/TabBodyArea.tag</path>
-   	</tag-file>
-   	<tag-file>
-       <name>CKEditor</name>
-       <path>/WEB-INF/tags/CKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   
@@ -281,86 +266,82 @@
        <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Rating</name>
-       <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>    		
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>StyledRating</name>
-       <path>/WEB-INF/tags/StyledRating.tag</path>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>headItems</name>
-       <path>/WEB-INF/tags/headItems.tag</path>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
-   	</tag-file>  
+   	</tag-file> 
    	<tag-file>
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Alert</name>
-		<path>/WEB-INF/tags/Alert.tag</path>
-   	</tag-file>  
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Page</name>
-		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>
+	    <name>errors</name>
+		<path>/WEB-INF/tags/Errors.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>TSTable</name>
-		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>    
-  	<tag-file>
-	    <name>Arrow</name>
-		<path>/WEB-INF/tags/Arrow.tag</path>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>AdvancedAccordian</name>
-       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
-   	</tag-file>  
-   	<tag-file>
-   		<name>RestrictedUsageAccordian</name>
-   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
    	</tag-file>
-  	<tag-file>
-	    <name>SimplePanel</name>
-		<path>/WEB-INF/tags/SimplePanel.tag</path>
-   	</tag-file>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>
    	<tag-file>
+       <name>headItems</name>
+       <path>/WEB-INF/tags/headItems.tag</path>
+   	</tag-file> 
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TextSearch</name>
-		<path>/WEB-INF/tags/TextSearch.tag</path>
-   	</tag-file>  
+       <name>Input</name>
+       <path>/WEB-INF/tags/Input.tag</path>
+   	</tag-file>
    	<tag-file>
+       <name>JSImport</name>
+       <path>/WEB-INF/tags/JSImport.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Notebook</name>
+		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file> 
    	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag-file>
-       <name>Etherpad</name>
-       <path>/WEB-INF/tags/Etherpad.tag</path>
-   	</tag-file> 
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
    	<tag-file>
-	    <name>errors</name>
-		<path>/WEB-INF/tags/Errors.tag</path>
-   	</tag-file> 
-   	<tag-file>
-	    <name>errors5</name>
-		<path>/WEB-INF/tags/Errors5.tag</path>
-   	</tag-file>    
-   	<tag-file>
-	    <name>Widget</name>
-		<path>/WEB-INF/tags/Widget.tag</path>
-   	</tag-file>   
-   	<tag-file>
 	    <name>Page5</name>
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
@@ -369,92 +350,71 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TSTable5</name>
-		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>  
+       <name>Popover</name>
+       <path>/WEB-INF/tags/Popover.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>WaitForLeader</name>
-		<path>/WEB-INF/tags/WaitForLeader.tag</path>
-   	</tag-file>  
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Alert5</name>
-		<path>/WEB-INF/tags/Alert5.tag</path>
-   	</tag-file>  
-   	<tag-file>
-       <name>FileUpload5</name>
-       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
-   	<tag>
-    <name>textarea</name>
-    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
-    <body-content>JSP</body-content>
-    <dynamic-attributes>true</dynamic-attributes>
-    <description>
-    	Render text exactly same as  original input, which even won't escape the input HTML tag.
-    </description>    
-    <attribute>
-        <description>
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>id</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>onchange</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>disabled</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-	<tag-file>
-		<name>head</name>
-	    <path>/WEB-INF/tags/Head.tag</path>
-	</tag-file>
-   	<tag-file>
-       <name>Comments</name>
-       <path>/WEB-INF/tags/Comments.tag</path>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>CommentsAuthor</name>
-       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
+   	</tag-file>    		
+   	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FileUpload</name>
-       <path>/WEB-INF/tags/FileUpload.tag</path>
+       <name>Switch</name>
+       <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>WaitingSpinner</name>
-       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>JSImport</name>
-       <path>/WEB-INF/tags/JSImport.tag</path>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Popover</name>
-       <path>/WEB-INF/tags/Popover.tag</path>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Input</name>
-       <path>/WEB-INF/tags/Input.tag</path>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Switch</name>
-       <path>/WEB-INF/tags/Switch.tag</path>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>TSTable5</name>
+		<path>/WEB-INF/tags/TSTable5.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
    	</tag-file>
+	<tag-file>
+	    <name>Widget</name>
+		<path>/WEB-INF/tags/Widget.tag</path>
+   	</tag-file> 
 </taglib>
\ No newline at end of file
Index: lams_tool_lamc/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u
--- lams_tool_lamc/web/WEB-INF/tags/Notebook.tag	(revision 0)
+++ lams_tool_lamc/web/WEB-INF/tags/Notebook.tag	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -0,0 +1,108 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="instructions" required="true" rtexprvalue="true"%>
+<%@ attribute name="formActionUrl" required="true" rtexprvalue="true"%>
+<%@ attribute name="formModelAttribute" required="false" rtexprvalue="true"%>
+<c:if test="${empty formModelAttribute}">
+	<c:set var="formModelAttribute" value="reflectionForm" />
+</c:if>
+<%@ attribute name="isNextActivityButtonSupported" required="true" rtexprvalue="true"%>
+<%@ attribute name="isLastActivity" required="false" rtexprvalue="true"%>
+<%@ attribute name="hiddenInputs" required="false" rtexprvalue="true"%>
+<c:if test="${empty hiddenInputs}">
+	<c:set var="hiddenInputs" value="userID,sessionMapID" />
+</c:if>
+<%@ attribute name="isNbTool" required="false" rtexprvalue="true"%>
+<c:if test="${empty isNbTool}">
+	<c:set var="isNbTool" value="false" />
+</c:if>
+
+<%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
+<%-- Default value for I18N keys --%> 
+<c:if test="${empty notebookLabelKey}">
+	<c:set var="notebookLabelKey" value="label.notebook" />
+</c:if>
+<c:if test="${empty finishButtonLabelKey}">
+	<c:set var="finishButtonLabelKey" value="label.submit" />
+</c:if>
+<c:if test="${empty nextActivityButtonLabelKey}">
+	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+</c:if>
+
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
+		}
+		function submitForm() {
+			var f = document.getElementById('reflectionForm');
+			f.submit();
+		}
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+	
+	<div id="instructions" class="instructions">
+		<lams:out value="${instructions}" escapeHtml="true" />
+	</div>
+	<hr class="mx-5">
+
+	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
+			<form:hidden path="${hiddenInput}" />
+		</c:forTokens>	
+			
+		<lams:errors5/>
+		
+		<div class="container-lg">
+			<div class="card lcard lcard-no-borders shadow mb-3">
+				<div class="card-header lcard-header-button-border">
+					<fmt:message key="${notebookLabelKey}" />
+				</div>
+				<div class="card-body mb-3">
+					<fmt:message key="${notebookLabelKey}" var="notebookLabel"/>
+					<form:textarea aria-label="${notebookLabel}" aria-multiline="true"
+						aria-required="true" required="true" path="entryText"
+						cssClass="form-control" id="focused" rows="5"></form:textarea>
+				</div>
+			</div>
+	
+			<div class="activity-bottom-buttons">
+				<button name="finishButton" id="finishButton" class="btn btn-primary">
+					<c:choose>
+						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
+							<fmt:message key="${finishButtonLabelKey}" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="${nextActivityButtonLabelKey}" />
+						</c:otherwise>
+					</c:choose>
+				</buttun>
+			</div>
+		
+		</div>
+	</form:form>
+	
+	<c:if test="${isNbTool}">
+		<!-- 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="${toolSessionID}"
+						   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
+						   pageSize="10" sortBy="1" />
+		</c:if>
+		<!-- End comments -->
+	</c:if>
+
+</lams:PageLearner>
\ No newline at end of file
Index: lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r14a43ff0db3bd18db9a56dde9555420f04347c47 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
+++ lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -16,161 +16,123 @@
    </listener>
 
    <tag>
-
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
       <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
       <name>WebAppURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
       </icon>
       <name>help</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Help tag</description>
          <name>module</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>toolSignature</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>page</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>style</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
       </icon>
       <name>Configuration</name>
       <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Get the configuration value for the specified key</description>
          <name>key</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
       <name>LAMSURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
       </icon>
       <name>html</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
          <description>Render html tag with direction and language</description>
          <name>xhtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
       <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
       <name>out</name>
       <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>value</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>escapeHtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts role name into form usable as message resources key</description>
       <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
       <name>role</name>
       <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts role name into form usable as message resources key</description>
          <name>role</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -192,7 +154,6 @@
  	  </attribute>
    </tag>
    <tag>
-
       <description>Output details from the shared session UserDTO object</description>
       <display-name>user details</display-name>
       <icon>    
@@ -205,14 +166,9 @@
          <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
-
-	
 	<tag>
       <description>Small portrait of a user</description>
       <display-name>User Portrait</display-name>
@@ -243,32 +199,61 @@
          <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
       </attribute>
    </tag>
-	
-	<tag-file>
-       <name>Tab</name>
-       <path>/WEB-INF/tags/Tab.tag</path>
-   	</tag-file>
+   <tag>
+	    <name>textarea</name>
+	    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
+	    <body-content>JSP</body-content>
+	    <dynamic-attributes>true</dynamic-attributes>
+	    <description>
+	    	Render text exactly same as  original input, which even won't escape the input HTML tag.
+	    </description>    
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>name</name>
+	        <required>true</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>id</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>onchange</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>disabled</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+  	</tag>
+  	
    	<tag-file>
-       <name>Tabs</name>
-       <path>/WEB-INF/tags/Tabs.tag</path>
-   	</tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+   	</tag-file> 
    	<tag-file>
-       <name>TabBody</name>
-       <path>/WEB-INF/tags/TabBody.tag</path>
-   	</tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
    	<tag-file>
-       <name>TabBodys</name>
-       <path>/WEB-INF/tags/TabBodys.tag</path>
+	    <name>Alert5</name>
+		<path>/WEB-INF/tags/Alert5.tag</path>
+   	</tag-file> 
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>TabBodyArea</name>
-       <path>/WEB-INF/tags/TabBodyArea.tag</path>
-   	</tag-file>
-   	<tag-file>
-       <name>CKEditor</name>
-       <path>/WEB-INF/tags/CKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   
@@ -281,86 +266,82 @@
        <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Rating</name>
-       <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>    		
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>StyledRating</name>
-       <path>/WEB-INF/tags/StyledRating.tag</path>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>headItems</name>
-       <path>/WEB-INF/tags/headItems.tag</path>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
-   	</tag-file>  
+   	</tag-file> 
    	<tag-file>
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Alert</name>
-		<path>/WEB-INF/tags/Alert.tag</path>
-   	</tag-file>  
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Page</name>
-		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>
+	    <name>errors</name>
+		<path>/WEB-INF/tags/Errors.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>TSTable</name>
-		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>    
-  	<tag-file>
-	    <name>Arrow</name>
-		<path>/WEB-INF/tags/Arrow.tag</path>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>AdvancedAccordian</name>
-       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
-   	</tag-file>  
-   	<tag-file>
-   		<name>RestrictedUsageAccordian</name>
-   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
    	</tag-file>
-  	<tag-file>
-	    <name>SimplePanel</name>
-		<path>/WEB-INF/tags/SimplePanel.tag</path>
-   	</tag-file>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>
    	<tag-file>
+       <name>headItems</name>
+       <path>/WEB-INF/tags/headItems.tag</path>
+   	</tag-file> 
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TextSearch</name>
-		<path>/WEB-INF/tags/TextSearch.tag</path>
-   	</tag-file>  
+       <name>Input</name>
+       <path>/WEB-INF/tags/Input.tag</path>
+   	</tag-file>
    	<tag-file>
+       <name>JSImport</name>
+       <path>/WEB-INF/tags/JSImport.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Notebook</name>
+		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file> 
    	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag-file>
-       <name>Etherpad</name>
-       <path>/WEB-INF/tags/Etherpad.tag</path>
-   	</tag-file> 
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
    	<tag-file>
-	    <name>errors</name>
-		<path>/WEB-INF/tags/Errors.tag</path>
-   	</tag-file> 
-   	<tag-file>
-	    <name>errors5</name>
-		<path>/WEB-INF/tags/Errors5.tag</path>
-   	</tag-file>    
-   	<tag-file>
-	    <name>Widget</name>
-		<path>/WEB-INF/tags/Widget.tag</path>
-   	</tag-file>   
-   	<tag-file>
 	    <name>Page5</name>
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
@@ -369,92 +350,71 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TSTable5</name>
-		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>  
+       <name>Popover</name>
+       <path>/WEB-INF/tags/Popover.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>WaitForLeader</name>
-		<path>/WEB-INF/tags/WaitForLeader.tag</path>
-   	</tag-file>  
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Alert5</name>
-		<path>/WEB-INF/tags/Alert5.tag</path>
-   	</tag-file>  
-   	<tag-file>
-       <name>FileUpload5</name>
-       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
-   	<tag>
-    <name>textarea</name>
-    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
-    <body-content>JSP</body-content>
-    <dynamic-attributes>true</dynamic-attributes>
-    <description>
-    	Render text exactly same as  original input, which even won't escape the input HTML tag.
-    </description>    
-    <attribute>
-        <description>
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>id</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>onchange</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>disabled</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-	<tag-file>
-		<name>head</name>
-	    <path>/WEB-INF/tags/Head.tag</path>
-	</tag-file>
-   	<tag-file>
-       <name>Comments</name>
-       <path>/WEB-INF/tags/Comments.tag</path>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>CommentsAuthor</name>
-       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
+   	</tag-file>    		
+   	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FileUpload</name>
-       <path>/WEB-INF/tags/FileUpload.tag</path>
+       <name>Switch</name>
+       <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>WaitingSpinner</name>
-       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>JSImport</name>
-       <path>/WEB-INF/tags/JSImport.tag</path>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Popover</name>
-       <path>/WEB-INF/tags/Popover.tag</path>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Input</name>
-       <path>/WEB-INF/tags/Input.tag</path>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Switch</name>
-       <path>/WEB-INF/tags/Switch.tag</path>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>TSTable5</name>
+		<path>/WEB-INF/tags/TSTable5.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
    	</tag-file>
+	<tag-file>
+	    <name>Widget</name>
+		<path>/WEB-INF/tags/Widget.tag</path>
+   	</tag-file> 
 </taglib>
\ No newline at end of file
Index: lams_tool_laqa/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u
--- lams_tool_laqa/web/WEB-INF/tags/Notebook.tag	(revision 0)
+++ lams_tool_laqa/web/WEB-INF/tags/Notebook.tag	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -0,0 +1,108 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="instructions" required="true" rtexprvalue="true"%>
+<%@ attribute name="formActionUrl" required="true" rtexprvalue="true"%>
+<%@ attribute name="formModelAttribute" required="false" rtexprvalue="true"%>
+<c:if test="${empty formModelAttribute}">
+	<c:set var="formModelAttribute" value="reflectionForm" />
+</c:if>
+<%@ attribute name="isNextActivityButtonSupported" required="true" rtexprvalue="true"%>
+<%@ attribute name="isLastActivity" required="false" rtexprvalue="true"%>
+<%@ attribute name="hiddenInputs" required="false" rtexprvalue="true"%>
+<c:if test="${empty hiddenInputs}">
+	<c:set var="hiddenInputs" value="userID,sessionMapID" />
+</c:if>
+<%@ attribute name="isNbTool" required="false" rtexprvalue="true"%>
+<c:if test="${empty isNbTool}">
+	<c:set var="isNbTool" value="false" />
+</c:if>
+
+<%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
+<%-- Default value for I18N keys --%> 
+<c:if test="${empty notebookLabelKey}">
+	<c:set var="notebookLabelKey" value="label.notebook" />
+</c:if>
+<c:if test="${empty finishButtonLabelKey}">
+	<c:set var="finishButtonLabelKey" value="label.submit" />
+</c:if>
+<c:if test="${empty nextActivityButtonLabelKey}">
+	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+</c:if>
+
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
+		}
+		function submitForm() {
+			var f = document.getElementById('reflectionForm');
+			f.submit();
+		}
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+	
+	<div id="instructions" class="instructions">
+		<lams:out value="${instructions}" escapeHtml="true" />
+	</div>
+	<hr class="mx-5">
+
+	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
+			<form:hidden path="${hiddenInput}" />
+		</c:forTokens>	
+			
+		<lams:errors5/>
+		
+		<div class="container-lg">
+			<div class="card lcard lcard-no-borders shadow mb-3">
+				<div class="card-header lcard-header-button-border">
+					<fmt:message key="${notebookLabelKey}" />
+				</div>
+				<div class="card-body mb-3">
+					<fmt:message key="${notebookLabelKey}" var="notebookLabel"/>
+					<form:textarea aria-label="${notebookLabel}" aria-multiline="true"
+						aria-required="true" required="true" path="entryText"
+						cssClass="form-control" id="focused" rows="5"></form:textarea>
+				</div>
+			</div>
+	
+			<div class="activity-bottom-buttons">
+				<button name="finishButton" id="finishButton" class="btn btn-primary">
+					<c:choose>
+						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
+							<fmt:message key="${finishButtonLabelKey}" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="${nextActivityButtonLabelKey}" />
+						</c:otherwise>
+					</c:choose>
+				</buttun>
+			</div>
+		
+		</div>
+	</form:form>
+	
+	<c:if test="${isNbTool}">
+		<!-- 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="${toolSessionID}"
+						   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
+						   pageSize="10" sortBy="1" />
+		</c:if>
+		<!-- End comments -->
+	</c:if>
+
+</lams:PageLearner>
\ No newline at end of file
Index: lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r14a43ff0db3bd18db9a56dde9555420f04347c47 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
+++ lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -16,161 +16,123 @@
    </listener>
 
    <tag>
-
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
       <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
       <name>WebAppURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
       </icon>
       <name>help</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Help tag</description>
          <name>module</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>toolSignature</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>page</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>style</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
       </icon>
       <name>Configuration</name>
       <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Get the configuration value for the specified key</description>
          <name>key</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
       <name>LAMSURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
       </icon>
       <name>html</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
          <description>Render html tag with direction and language</description>
          <name>xhtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
       <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
       <name>out</name>
       <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>value</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>escapeHtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts role name into form usable as message resources key</description>
       <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
       <name>role</name>
       <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts role name into form usable as message resources key</description>
          <name>role</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -192,7 +154,6 @@
  	  </attribute>
    </tag>
    <tag>
-
       <description>Output details from the shared session UserDTO object</description>
       <display-name>user details</display-name>
       <icon>    
@@ -205,14 +166,9 @@
          <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
-
-	
 	<tag>
       <description>Small portrait of a user</description>
       <display-name>User Portrait</display-name>
@@ -243,32 +199,61 @@
          <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
       </attribute>
    </tag>
-	
-	<tag-file>
-       <name>Tab</name>
-       <path>/WEB-INF/tags/Tab.tag</path>
-   	</tag-file>
+   <tag>
+	    <name>textarea</name>
+	    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
+	    <body-content>JSP</body-content>
+	    <dynamic-attributes>true</dynamic-attributes>
+	    <description>
+	    	Render text exactly same as  original input, which even won't escape the input HTML tag.
+	    </description>    
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>name</name>
+	        <required>true</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>id</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>onchange</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>disabled</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+  	</tag>
+  	
    	<tag-file>
-       <name>Tabs</name>
-       <path>/WEB-INF/tags/Tabs.tag</path>
-   	</tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+   	</tag-file> 
    	<tag-file>
-       <name>TabBody</name>
-       <path>/WEB-INF/tags/TabBody.tag</path>
-   	</tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
    	<tag-file>
-       <name>TabBodys</name>
-       <path>/WEB-INF/tags/TabBodys.tag</path>
+	    <name>Alert5</name>
+		<path>/WEB-INF/tags/Alert5.tag</path>
+   	</tag-file> 
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>TabBodyArea</name>
-       <path>/WEB-INF/tags/TabBodyArea.tag</path>
-   	</tag-file>
-   	<tag-file>
-       <name>CKEditor</name>
-       <path>/WEB-INF/tags/CKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   
@@ -281,86 +266,82 @@
        <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Rating</name>
-       <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>    		
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>StyledRating</name>
-       <path>/WEB-INF/tags/StyledRating.tag</path>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>headItems</name>
-       <path>/WEB-INF/tags/headItems.tag</path>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
-   	</tag-file>  
+   	</tag-file> 
    	<tag-file>
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Alert</name>
-		<path>/WEB-INF/tags/Alert.tag</path>
-   	</tag-file>  
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Page</name>
-		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>
+	    <name>errors</name>
+		<path>/WEB-INF/tags/Errors.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>TSTable</name>
-		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>    
-  	<tag-file>
-	    <name>Arrow</name>
-		<path>/WEB-INF/tags/Arrow.tag</path>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>AdvancedAccordian</name>
-       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
-   	</tag-file>  
-   	<tag-file>
-   		<name>RestrictedUsageAccordian</name>
-   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
    	</tag-file>
-  	<tag-file>
-	    <name>SimplePanel</name>
-		<path>/WEB-INF/tags/SimplePanel.tag</path>
-   	</tag-file>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>
    	<tag-file>
+       <name>headItems</name>
+       <path>/WEB-INF/tags/headItems.tag</path>
+   	</tag-file> 
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TextSearch</name>
-		<path>/WEB-INF/tags/TextSearch.tag</path>
-   	</tag-file>  
+       <name>Input</name>
+       <path>/WEB-INF/tags/Input.tag</path>
+   	</tag-file>
    	<tag-file>
+       <name>JSImport</name>
+       <path>/WEB-INF/tags/JSImport.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Notebook</name>
+		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file> 
    	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag-file>
-       <name>Etherpad</name>
-       <path>/WEB-INF/tags/Etherpad.tag</path>
-   	</tag-file> 
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
    	<tag-file>
-	    <name>errors</name>
-		<path>/WEB-INF/tags/Errors.tag</path>
-   	</tag-file> 
-   	<tag-file>
-	    <name>errors5</name>
-		<path>/WEB-INF/tags/Errors5.tag</path>
-   	</tag-file>    
-   	<tag-file>
-	    <name>Widget</name>
-		<path>/WEB-INF/tags/Widget.tag</path>
-   	</tag-file>   
-   	<tag-file>
 	    <name>Page5</name>
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
@@ -369,92 +350,71 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TSTable5</name>
-		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>  
+       <name>Popover</name>
+       <path>/WEB-INF/tags/Popover.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>WaitForLeader</name>
-		<path>/WEB-INF/tags/WaitForLeader.tag</path>
-   	</tag-file>  
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Alert5</name>
-		<path>/WEB-INF/tags/Alert5.tag</path>
-   	</tag-file>  
-   	<tag-file>
-       <name>FileUpload5</name>
-       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
-   	<tag>
-    <name>textarea</name>
-    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
-    <body-content>JSP</body-content>
-    <dynamic-attributes>true</dynamic-attributes>
-    <description>
-    	Render text exactly same as  original input, which even won't escape the input HTML tag.
-    </description>    
-    <attribute>
-        <description>
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>id</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>onchange</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>disabled</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-	<tag-file>
-		<name>head</name>
-	    <path>/WEB-INF/tags/Head.tag</path>
-	</tag-file>
-   	<tag-file>
-       <name>Comments</name>
-       <path>/WEB-INF/tags/Comments.tag</path>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>CommentsAuthor</name>
-       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
+   	</tag-file>    		
+   	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FileUpload</name>
-       <path>/WEB-INF/tags/FileUpload.tag</path>
+       <name>Switch</name>
+       <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>WaitingSpinner</name>
-       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>JSImport</name>
-       <path>/WEB-INF/tags/JSImport.tag</path>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Popover</name>
-       <path>/WEB-INF/tags/Popover.tag</path>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Input</name>
-       <path>/WEB-INF/tags/Input.tag</path>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Switch</name>
-       <path>/WEB-INF/tags/Switch.tag</path>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>TSTable5</name>
+		<path>/WEB-INF/tags/TSTable5.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
    	</tag-file>
+	<tag-file>
+	    <name>Widget</name>
+		<path>/WEB-INF/tags/Widget.tag</path>
+   	</tag-file> 
 </taglib>
\ No newline at end of file
Index: lams_tool_laqa/web/learning/Notebook.jsp
===================================================================
diff -u -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_tool_laqa/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
+++ lams_tool_laqa/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -1,62 +1,15 @@
 <!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
-<lams:html>
-<lams:head>
-	<lams:css />
-	<title><fmt:message key="activity.title" /></title>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
-	<lams:JSImport src="learning/includes/javascript/gate-check.js" />
-	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${qaLearningForm.toolSessionID}', '', function(){
-			$('#qaLearningForm').submit();
-		});
-		
-		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
-		}
-	</script>
-</lams:head>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-<body class="stripes">
-
-<!-- form needs to be outside page so that the form bean can be picked up by Page tag. -->
-<form:form action="submitReflection.do" modelAttribute="qaLearningForm" id="qaLearningForm" onsubmit="disableFinishButton()">
-<lams:Page type="learner" title="${generalLearnerFlowDTO.activityTitle}">
-
-	<form:hidden path="toolSessionID" />
-	<form:hidden path="userID" />
-	<form:hidden path="sessionMapID" />
-	<form:hidden path="totalQuestionCount" />
-
-	<p>
-		<lams:out value="${generalLearnerFlowDTO.reflectionSubject}" escapeHtml="true" />
-	</p>
-
-	<form:textarea id="focused" rows="5" path="entryText" cssClass="form-control"></form:textarea>
-
-	<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>
-
-<script type="text/javascript">
-	window.onload = function() {
-		document.getElementById("focused").focus();
-	}
-</script>
-
-</body>
-</lams:html>
+<lams:Notebook title="${generalLearnerFlowDTO.activityTitle}"
+	toolSessionID="${qaLearningForm.toolSessionID}"
+	instructions="${generalLearnerFlowDTO.reflectionSubject}"
+	formActionUrl="submitReflection.do"
+	formModelAttribute="qaLearningForm"
+	hiddenInputs="toolSessionID,userID,sessionMapID,totalQuestionCount"
+	notebookLabelKey="label.reflection"
+	isNextActivityButtonSupported="true"
+	isLastActivity="${sessionMap.isLastActivity}"
+	finishButtonLabelKey="button.submit"
+	nextActivityButtonLabelKey="button.endLearning"/>
Index: lams_tool_larsrc/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u
--- lams_tool_larsrc/web/WEB-INF/tags/Notebook.tag	(revision 0)
+++ lams_tool_larsrc/web/WEB-INF/tags/Notebook.tag	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -0,0 +1,108 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="instructions" required="true" rtexprvalue="true"%>
+<%@ attribute name="formActionUrl" required="true" rtexprvalue="true"%>
+<%@ attribute name="formModelAttribute" required="false" rtexprvalue="true"%>
+<c:if test="${empty formModelAttribute}">
+	<c:set var="formModelAttribute" value="reflectionForm" />
+</c:if>
+<%@ attribute name="isNextActivityButtonSupported" required="true" rtexprvalue="true"%>
+<%@ attribute name="isLastActivity" required="false" rtexprvalue="true"%>
+<%@ attribute name="hiddenInputs" required="false" rtexprvalue="true"%>
+<c:if test="${empty hiddenInputs}">
+	<c:set var="hiddenInputs" value="userID,sessionMapID" />
+</c:if>
+<%@ attribute name="isNbTool" required="false" rtexprvalue="true"%>
+<c:if test="${empty isNbTool}">
+	<c:set var="isNbTool" value="false" />
+</c:if>
+
+<%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
+<%-- Default value for I18N keys --%> 
+<c:if test="${empty notebookLabelKey}">
+	<c:set var="notebookLabelKey" value="label.notebook" />
+</c:if>
+<c:if test="${empty finishButtonLabelKey}">
+	<c:set var="finishButtonLabelKey" value="label.submit" />
+</c:if>
+<c:if test="${empty nextActivityButtonLabelKey}">
+	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+</c:if>
+
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
+		}
+		function submitForm() {
+			var f = document.getElementById('reflectionForm');
+			f.submit();
+		}
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+	
+	<div id="instructions" class="instructions">
+		<lams:out value="${instructions}" escapeHtml="true" />
+	</div>
+	<hr class="mx-5">
+
+	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
+			<form:hidden path="${hiddenInput}" />
+		</c:forTokens>	
+			
+		<lams:errors5/>
+		
+		<div class="container-lg">
+			<div class="card lcard lcard-no-borders shadow mb-3">
+				<div class="card-header lcard-header-button-border">
+					<fmt:message key="${notebookLabelKey}" />
+				</div>
+				<div class="card-body mb-3">
+					<fmt:message key="${notebookLabelKey}" var="notebookLabel"/>
+					<form:textarea aria-label="${notebookLabel}" aria-multiline="true"
+						aria-required="true" required="true" path="entryText"
+						cssClass="form-control" id="focused" rows="5"></form:textarea>
+				</div>
+			</div>
+	
+			<div class="activity-bottom-buttons">
+				<button name="finishButton" id="finishButton" class="btn btn-primary">
+					<c:choose>
+						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
+							<fmt:message key="${finishButtonLabelKey}" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="${nextActivityButtonLabelKey}" />
+						</c:otherwise>
+					</c:choose>
+				</buttun>
+			</div>
+		
+		</div>
+	</form:form>
+	
+	<c:if test="${isNbTool}">
+		<!-- 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="${toolSessionID}"
+						   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
+						   pageSize="10" sortBy="1" />
+		</c:if>
+		<!-- End comments -->
+	</c:if>
+
+</lams:PageLearner>
\ No newline at end of file
Index: lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r14a43ff0db3bd18db9a56dde9555420f04347c47 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
+++ lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -16,161 +16,123 @@
    </listener>
 
    <tag>
-
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
       <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
       <name>WebAppURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
       </icon>
       <name>help</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Help tag</description>
          <name>module</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>toolSignature</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>page</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>style</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
       </icon>
       <name>Configuration</name>
       <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Get the configuration value for the specified key</description>
          <name>key</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
       <name>LAMSURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
       </icon>
       <name>html</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
          <description>Render html tag with direction and language</description>
          <name>xhtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
       <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
       <name>out</name>
       <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>value</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>escapeHtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts role name into form usable as message resources key</description>
       <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
       <name>role</name>
       <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts role name into form usable as message resources key</description>
          <name>role</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -192,7 +154,6 @@
  	  </attribute>
    </tag>
    <tag>
-
       <description>Output details from the shared session UserDTO object</description>
       <display-name>user details</display-name>
       <icon>    
@@ -205,14 +166,9 @@
          <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
-
-	
 	<tag>
       <description>Small portrait of a user</description>
       <display-name>User Portrait</display-name>
@@ -243,32 +199,61 @@
          <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
       </attribute>
    </tag>
-	
-	<tag-file>
-       <name>Tab</name>
-       <path>/WEB-INF/tags/Tab.tag</path>
-   	</tag-file>
+   <tag>
+	    <name>textarea</name>
+	    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
+	    <body-content>JSP</body-content>
+	    <dynamic-attributes>true</dynamic-attributes>
+	    <description>
+	    	Render text exactly same as  original input, which even won't escape the input HTML tag.
+	    </description>    
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>name</name>
+	        <required>true</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>id</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>onchange</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>disabled</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+  	</tag>
+  	
    	<tag-file>
-       <name>Tabs</name>
-       <path>/WEB-INF/tags/Tabs.tag</path>
-   	</tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+   	</tag-file> 
    	<tag-file>
-       <name>TabBody</name>
-       <path>/WEB-INF/tags/TabBody.tag</path>
-   	</tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
    	<tag-file>
-       <name>TabBodys</name>
-       <path>/WEB-INF/tags/TabBodys.tag</path>
+	    <name>Alert5</name>
+		<path>/WEB-INF/tags/Alert5.tag</path>
+   	</tag-file> 
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>TabBodyArea</name>
-       <path>/WEB-INF/tags/TabBodyArea.tag</path>
-   	</tag-file>
-   	<tag-file>
-       <name>CKEditor</name>
-       <path>/WEB-INF/tags/CKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   
@@ -281,86 +266,82 @@
        <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Rating</name>
-       <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>    		
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>StyledRating</name>
-       <path>/WEB-INF/tags/StyledRating.tag</path>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>headItems</name>
-       <path>/WEB-INF/tags/headItems.tag</path>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
-   	</tag-file>  
+   	</tag-file> 
    	<tag-file>
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Alert</name>
-		<path>/WEB-INF/tags/Alert.tag</path>
-   	</tag-file>  
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Page</name>
-		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>
+	    <name>errors</name>
+		<path>/WEB-INF/tags/Errors.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>TSTable</name>
-		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>    
-  	<tag-file>
-	    <name>Arrow</name>
-		<path>/WEB-INF/tags/Arrow.tag</path>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>AdvancedAccordian</name>
-       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
-   	</tag-file>  
-   	<tag-file>
-   		<name>RestrictedUsageAccordian</name>
-   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
    	</tag-file>
-  	<tag-file>
-	    <name>SimplePanel</name>
-		<path>/WEB-INF/tags/SimplePanel.tag</path>
-   	</tag-file>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>
    	<tag-file>
+       <name>headItems</name>
+       <path>/WEB-INF/tags/headItems.tag</path>
+   	</tag-file> 
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TextSearch</name>
-		<path>/WEB-INF/tags/TextSearch.tag</path>
-   	</tag-file>  
+       <name>Input</name>
+       <path>/WEB-INF/tags/Input.tag</path>
+   	</tag-file>
    	<tag-file>
+       <name>JSImport</name>
+       <path>/WEB-INF/tags/JSImport.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Notebook</name>
+		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file> 
    	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag-file>
-       <name>Etherpad</name>
-       <path>/WEB-INF/tags/Etherpad.tag</path>
-   	</tag-file> 
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
    	<tag-file>
-	    <name>errors</name>
-		<path>/WEB-INF/tags/Errors.tag</path>
-   	</tag-file> 
-   	<tag-file>
-	    <name>errors5</name>
-		<path>/WEB-INF/tags/Errors5.tag</path>
-   	</tag-file>    
-   	<tag-file>
-	    <name>Widget</name>
-		<path>/WEB-INF/tags/Widget.tag</path>
-   	</tag-file>   
-   	<tag-file>
 	    <name>Page5</name>
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
@@ -369,92 +350,71 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TSTable5</name>
-		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>  
+       <name>Popover</name>
+       <path>/WEB-INF/tags/Popover.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>WaitForLeader</name>
-		<path>/WEB-INF/tags/WaitForLeader.tag</path>
-   	</tag-file>  
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Alert5</name>
-		<path>/WEB-INF/tags/Alert5.tag</path>
-   	</tag-file>  
-   	<tag-file>
-       <name>FileUpload5</name>
-       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
-   	<tag>
-    <name>textarea</name>
-    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
-    <body-content>JSP</body-content>
-    <dynamic-attributes>true</dynamic-attributes>
-    <description>
-    	Render text exactly same as  original input, which even won't escape the input HTML tag.
-    </description>    
-    <attribute>
-        <description>
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>id</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>onchange</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>disabled</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-	<tag-file>
-		<name>head</name>
-	    <path>/WEB-INF/tags/Head.tag</path>
-	</tag-file>
-   	<tag-file>
-       <name>Comments</name>
-       <path>/WEB-INF/tags/Comments.tag</path>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>CommentsAuthor</name>
-       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
+   	</tag-file>    		
+   	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FileUpload</name>
-       <path>/WEB-INF/tags/FileUpload.tag</path>
+       <name>Switch</name>
+       <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>WaitingSpinner</name>
-       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>JSImport</name>
-       <path>/WEB-INF/tags/JSImport.tag</path>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Popover</name>
-       <path>/WEB-INF/tags/Popover.tag</path>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Input</name>
-       <path>/WEB-INF/tags/Input.tag</path>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Switch</name>
-       <path>/WEB-INF/tags/Switch.tag</path>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>TSTable5</name>
+		<path>/WEB-INF/tags/TSTable5.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
    	</tag-file>
+	<tag-file>
+	    <name>Widget</name>
+		<path>/WEB-INF/tags/Widget.tag</path>
+   	</tag-file> 
 </taglib>
\ No newline at end of file
Index: lams_tool_leader/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u
--- lams_tool_leader/web/WEB-INF/tags/Notebook.tag	(revision 0)
+++ lams_tool_leader/web/WEB-INF/tags/Notebook.tag	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -0,0 +1,108 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="instructions" required="true" rtexprvalue="true"%>
+<%@ attribute name="formActionUrl" required="true" rtexprvalue="true"%>
+<%@ attribute name="formModelAttribute" required="false" rtexprvalue="true"%>
+<c:if test="${empty formModelAttribute}">
+	<c:set var="formModelAttribute" value="reflectionForm" />
+</c:if>
+<%@ attribute name="isNextActivityButtonSupported" required="true" rtexprvalue="true"%>
+<%@ attribute name="isLastActivity" required="false" rtexprvalue="true"%>
+<%@ attribute name="hiddenInputs" required="false" rtexprvalue="true"%>
+<c:if test="${empty hiddenInputs}">
+	<c:set var="hiddenInputs" value="userID,sessionMapID" />
+</c:if>
+<%@ attribute name="isNbTool" required="false" rtexprvalue="true"%>
+<c:if test="${empty isNbTool}">
+	<c:set var="isNbTool" value="false" />
+</c:if>
+
+<%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
+<%-- Default value for I18N keys --%> 
+<c:if test="${empty notebookLabelKey}">
+	<c:set var="notebookLabelKey" value="label.notebook" />
+</c:if>
+<c:if test="${empty finishButtonLabelKey}">
+	<c:set var="finishButtonLabelKey" value="label.submit" />
+</c:if>
+<c:if test="${empty nextActivityButtonLabelKey}">
+	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+</c:if>
+
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
+		}
+		function submitForm() {
+			var f = document.getElementById('reflectionForm');
+			f.submit();
+		}
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+	
+	<div id="instructions" class="instructions">
+		<lams:out value="${instructions}" escapeHtml="true" />
+	</div>
+	<hr class="mx-5">
+
+	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
+			<form:hidden path="${hiddenInput}" />
+		</c:forTokens>	
+			
+		<lams:errors5/>
+		
+		<div class="container-lg">
+			<div class="card lcard lcard-no-borders shadow mb-3">
+				<div class="card-header lcard-header-button-border">
+					<fmt:message key="${notebookLabelKey}" />
+				</div>
+				<div class="card-body mb-3">
+					<fmt:message key="${notebookLabelKey}" var="notebookLabel"/>
+					<form:textarea aria-label="${notebookLabel}" aria-multiline="true"
+						aria-required="true" required="true" path="entryText"
+						cssClass="form-control" id="focused" rows="5"></form:textarea>
+				</div>
+			</div>
+	
+			<div class="activity-bottom-buttons">
+				<button name="finishButton" id="finishButton" class="btn btn-primary">
+					<c:choose>
+						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
+							<fmt:message key="${finishButtonLabelKey}" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="${nextActivityButtonLabelKey}" />
+						</c:otherwise>
+					</c:choose>
+				</buttun>
+			</div>
+		
+		</div>
+	</form:form>
+	
+	<c:if test="${isNbTool}">
+		<!-- 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="${toolSessionID}"
+						   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
+						   pageSize="10" sortBy="1" />
+		</c:if>
+		<!-- End comments -->
+	</c:if>
+
+</lams:PageLearner>
\ No newline at end of file
Index: lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r14a43ff0db3bd18db9a56dde9555420f04347c47 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
+++ lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -16,161 +16,123 @@
    </listener>
 
    <tag>
-
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
       <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
       <name>WebAppURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
       </icon>
       <name>help</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Help tag</description>
          <name>module</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>toolSignature</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>page</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>style</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
       </icon>
       <name>Configuration</name>
       <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Get the configuration value for the specified key</description>
          <name>key</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
       <name>LAMSURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
       </icon>
       <name>html</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
          <description>Render html tag with direction and language</description>
          <name>xhtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
       <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
       <name>out</name>
       <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>value</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>escapeHtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts role name into form usable as message resources key</description>
       <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
       <name>role</name>
       <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts role name into form usable as message resources key</description>
          <name>role</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -192,7 +154,6 @@
  	  </attribute>
    </tag>
    <tag>
-
       <description>Output details from the shared session UserDTO object</description>
       <display-name>user details</display-name>
       <icon>    
@@ -205,14 +166,9 @@
          <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
-
-	
 	<tag>
       <description>Small portrait of a user</description>
       <display-name>User Portrait</display-name>
@@ -243,32 +199,61 @@
          <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
       </attribute>
    </tag>
-	
-	<tag-file>
-       <name>Tab</name>
-       <path>/WEB-INF/tags/Tab.tag</path>
-   	</tag-file>
+   <tag>
+	    <name>textarea</name>
+	    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
+	    <body-content>JSP</body-content>
+	    <dynamic-attributes>true</dynamic-attributes>
+	    <description>
+	    	Render text exactly same as  original input, which even won't escape the input HTML tag.
+	    </description>    
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>name</name>
+	        <required>true</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>id</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>onchange</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>disabled</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+  	</tag>
+  	
    	<tag-file>
-       <name>Tabs</name>
-       <path>/WEB-INF/tags/Tabs.tag</path>
-   	</tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+   	</tag-file> 
    	<tag-file>
-       <name>TabBody</name>
-       <path>/WEB-INF/tags/TabBody.tag</path>
-   	</tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
    	<tag-file>
-       <name>TabBodys</name>
-       <path>/WEB-INF/tags/TabBodys.tag</path>
+	    <name>Alert5</name>
+		<path>/WEB-INF/tags/Alert5.tag</path>
+   	</tag-file> 
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>TabBodyArea</name>
-       <path>/WEB-INF/tags/TabBodyArea.tag</path>
-   	</tag-file>
-   	<tag-file>
-       <name>CKEditor</name>
-       <path>/WEB-INF/tags/CKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   
@@ -281,86 +266,82 @@
        <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Rating</name>
-       <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>    		
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>StyledRating</name>
-       <path>/WEB-INF/tags/StyledRating.tag</path>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>headItems</name>
-       <path>/WEB-INF/tags/headItems.tag</path>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
-   	</tag-file>  
+   	</tag-file> 
    	<tag-file>
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Alert</name>
-		<path>/WEB-INF/tags/Alert.tag</path>
-   	</tag-file>  
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Page</name>
-		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>
+	    <name>errors</name>
+		<path>/WEB-INF/tags/Errors.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>TSTable</name>
-		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>    
-  	<tag-file>
-	    <name>Arrow</name>
-		<path>/WEB-INF/tags/Arrow.tag</path>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>AdvancedAccordian</name>
-       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
-   	</tag-file>  
-   	<tag-file>
-   		<name>RestrictedUsageAccordian</name>
-   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
    	</tag-file>
-  	<tag-file>
-	    <name>SimplePanel</name>
-		<path>/WEB-INF/tags/SimplePanel.tag</path>
-   	</tag-file>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>
    	<tag-file>
+       <name>headItems</name>
+       <path>/WEB-INF/tags/headItems.tag</path>
+   	</tag-file> 
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TextSearch</name>
-		<path>/WEB-INF/tags/TextSearch.tag</path>
-   	</tag-file>  
+       <name>Input</name>
+       <path>/WEB-INF/tags/Input.tag</path>
+   	</tag-file>
    	<tag-file>
+       <name>JSImport</name>
+       <path>/WEB-INF/tags/JSImport.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Notebook</name>
+		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file> 
    	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag-file>
-       <name>Etherpad</name>
-       <path>/WEB-INF/tags/Etherpad.tag</path>
-   	</tag-file> 
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
    	<tag-file>
-	    <name>errors</name>
-		<path>/WEB-INF/tags/Errors.tag</path>
-   	</tag-file> 
-   	<tag-file>
-	    <name>errors5</name>
-		<path>/WEB-INF/tags/Errors5.tag</path>
-   	</tag-file>    
-   	<tag-file>
-	    <name>Widget</name>
-		<path>/WEB-INF/tags/Widget.tag</path>
-   	</tag-file>   
-   	<tag-file>
 	    <name>Page5</name>
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
@@ -369,92 +350,71 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TSTable5</name>
-		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>  
+       <name>Popover</name>
+       <path>/WEB-INF/tags/Popover.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>WaitForLeader</name>
-		<path>/WEB-INF/tags/WaitForLeader.tag</path>
-   	</tag-file>  
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Alert5</name>
-		<path>/WEB-INF/tags/Alert5.tag</path>
-   	</tag-file>  
-   	<tag-file>
-       <name>FileUpload5</name>
-       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
-   	<tag>
-    <name>textarea</name>
-    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
-    <body-content>JSP</body-content>
-    <dynamic-attributes>true</dynamic-attributes>
-    <description>
-    	Render text exactly same as  original input, which even won't escape the input HTML tag.
-    </description>    
-    <attribute>
-        <description>
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>id</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>onchange</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>disabled</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-	<tag-file>
-		<name>head</name>
-	    <path>/WEB-INF/tags/Head.tag</path>
-	</tag-file>
-   	<tag-file>
-       <name>Comments</name>
-       <path>/WEB-INF/tags/Comments.tag</path>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>CommentsAuthor</name>
-       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
+   	</tag-file>    		
+   	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FileUpload</name>
-       <path>/WEB-INF/tags/FileUpload.tag</path>
+       <name>Switch</name>
+       <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>WaitingSpinner</name>
-       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>JSImport</name>
-       <path>/WEB-INF/tags/JSImport.tag</path>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Popover</name>
-       <path>/WEB-INF/tags/Popover.tag</path>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Input</name>
-       <path>/WEB-INF/tags/Input.tag</path>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Switch</name>
-       <path>/WEB-INF/tags/Switch.tag</path>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>TSTable5</name>
+		<path>/WEB-INF/tags/TSTable5.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
    	</tag-file>
+	<tag-file>
+	    <name>Widget</name>
+		<path>/WEB-INF/tags/Widget.tag</path>
+   	</tag-file> 
 </taglib>
\ No newline at end of file
Index: lams_tool_mindmap/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u
--- lams_tool_mindmap/web/WEB-INF/tags/Notebook.tag	(revision 0)
+++ lams_tool_mindmap/web/WEB-INF/tags/Notebook.tag	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -0,0 +1,108 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="instructions" required="true" rtexprvalue="true"%>
+<%@ attribute name="formActionUrl" required="true" rtexprvalue="true"%>
+<%@ attribute name="formModelAttribute" required="false" rtexprvalue="true"%>
+<c:if test="${empty formModelAttribute}">
+	<c:set var="formModelAttribute" value="reflectionForm" />
+</c:if>
+<%@ attribute name="isNextActivityButtonSupported" required="true" rtexprvalue="true"%>
+<%@ attribute name="isLastActivity" required="false" rtexprvalue="true"%>
+<%@ attribute name="hiddenInputs" required="false" rtexprvalue="true"%>
+<c:if test="${empty hiddenInputs}">
+	<c:set var="hiddenInputs" value="userID,sessionMapID" />
+</c:if>
+<%@ attribute name="isNbTool" required="false" rtexprvalue="true"%>
+<c:if test="${empty isNbTool}">
+	<c:set var="isNbTool" value="false" />
+</c:if>
+
+<%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
+<%-- Default value for I18N keys --%> 
+<c:if test="${empty notebookLabelKey}">
+	<c:set var="notebookLabelKey" value="label.notebook" />
+</c:if>
+<c:if test="${empty finishButtonLabelKey}">
+	<c:set var="finishButtonLabelKey" value="label.submit" />
+</c:if>
+<c:if test="${empty nextActivityButtonLabelKey}">
+	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+</c:if>
+
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
+		}
+		function submitForm() {
+			var f = document.getElementById('reflectionForm');
+			f.submit();
+		}
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+	
+	<div id="instructions" class="instructions">
+		<lams:out value="${instructions}" escapeHtml="true" />
+	</div>
+	<hr class="mx-5">
+
+	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
+			<form:hidden path="${hiddenInput}" />
+		</c:forTokens>	
+			
+		<lams:errors5/>
+		
+		<div class="container-lg">
+			<div class="card lcard lcard-no-borders shadow mb-3">
+				<div class="card-header lcard-header-button-border">
+					<fmt:message key="${notebookLabelKey}" />
+				</div>
+				<div class="card-body mb-3">
+					<fmt:message key="${notebookLabelKey}" var="notebookLabel"/>
+					<form:textarea aria-label="${notebookLabel}" aria-multiline="true"
+						aria-required="true" required="true" path="entryText"
+						cssClass="form-control" id="focused" rows="5"></form:textarea>
+				</div>
+			</div>
+	
+			<div class="activity-bottom-buttons">
+				<button name="finishButton" id="finishButton" class="btn btn-primary">
+					<c:choose>
+						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
+							<fmt:message key="${finishButtonLabelKey}" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="${nextActivityButtonLabelKey}" />
+						</c:otherwise>
+					</c:choose>
+				</buttun>
+			</div>
+		
+		</div>
+	</form:form>
+	
+	<c:if test="${isNbTool}">
+		<!-- 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="${toolSessionID}"
+						   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
+						   pageSize="10" sortBy="1" />
+		</c:if>
+		<!-- End comments -->
+	</c:if>
+
+</lams:PageLearner>
\ No newline at end of file
Index: lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r14a43ff0db3bd18db9a56dde9555420f04347c47 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
+++ lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -16,161 +16,123 @@
    </listener>
 
    <tag>
-
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
       <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
       <name>WebAppURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
       </icon>
       <name>help</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Help tag</description>
          <name>module</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>toolSignature</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>page</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>style</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
       </icon>
       <name>Configuration</name>
       <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Get the configuration value for the specified key</description>
          <name>key</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
       <name>LAMSURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
       </icon>
       <name>html</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
          <description>Render html tag with direction and language</description>
          <name>xhtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
       <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
       <name>out</name>
       <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>value</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>escapeHtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts role name into form usable as message resources key</description>
       <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
       <name>role</name>
       <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts role name into form usable as message resources key</description>
          <name>role</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -192,7 +154,6 @@
  	  </attribute>
    </tag>
    <tag>
-
       <description>Output details from the shared session UserDTO object</description>
       <display-name>user details</display-name>
       <icon>    
@@ -205,14 +166,9 @@
          <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
-
-	
 	<tag>
       <description>Small portrait of a user</description>
       <display-name>User Portrait</display-name>
@@ -243,32 +199,61 @@
          <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
       </attribute>
    </tag>
-	
-	<tag-file>
-       <name>Tab</name>
-       <path>/WEB-INF/tags/Tab.tag</path>
-   	</tag-file>
+   <tag>
+	    <name>textarea</name>
+	    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
+	    <body-content>JSP</body-content>
+	    <dynamic-attributes>true</dynamic-attributes>
+	    <description>
+	    	Render text exactly same as  original input, which even won't escape the input HTML tag.
+	    </description>    
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>name</name>
+	        <required>true</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>id</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>onchange</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>disabled</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+  	</tag>
+  	
    	<tag-file>
-       <name>Tabs</name>
-       <path>/WEB-INF/tags/Tabs.tag</path>
-   	</tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+   	</tag-file> 
    	<tag-file>
-       <name>TabBody</name>
-       <path>/WEB-INF/tags/TabBody.tag</path>
-   	</tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
    	<tag-file>
-       <name>TabBodys</name>
-       <path>/WEB-INF/tags/TabBodys.tag</path>
+	    <name>Alert5</name>
+		<path>/WEB-INF/tags/Alert5.tag</path>
+   	</tag-file> 
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>TabBodyArea</name>
-       <path>/WEB-INF/tags/TabBodyArea.tag</path>
-   	</tag-file>
-   	<tag-file>
-       <name>CKEditor</name>
-       <path>/WEB-INF/tags/CKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   
@@ -281,86 +266,82 @@
        <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Rating</name>
-       <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>    		
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>StyledRating</name>
-       <path>/WEB-INF/tags/StyledRating.tag</path>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>headItems</name>
-       <path>/WEB-INF/tags/headItems.tag</path>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
-   	</tag-file>  
+   	</tag-file> 
    	<tag-file>
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Alert</name>
-		<path>/WEB-INF/tags/Alert.tag</path>
-   	</tag-file>  
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Page</name>
-		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>
+	    <name>errors</name>
+		<path>/WEB-INF/tags/Errors.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>TSTable</name>
-		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>    
-  	<tag-file>
-	    <name>Arrow</name>
-		<path>/WEB-INF/tags/Arrow.tag</path>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>AdvancedAccordian</name>
-       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
-   	</tag-file>  
-   	<tag-file>
-   		<name>RestrictedUsageAccordian</name>
-   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
    	</tag-file>
-  	<tag-file>
-	    <name>SimplePanel</name>
-		<path>/WEB-INF/tags/SimplePanel.tag</path>
-   	</tag-file>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>
    	<tag-file>
+       <name>headItems</name>
+       <path>/WEB-INF/tags/headItems.tag</path>
+   	</tag-file> 
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TextSearch</name>
-		<path>/WEB-INF/tags/TextSearch.tag</path>
-   	</tag-file>  
+       <name>Input</name>
+       <path>/WEB-INF/tags/Input.tag</path>
+   	</tag-file>
    	<tag-file>
+       <name>JSImport</name>
+       <path>/WEB-INF/tags/JSImport.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Notebook</name>
+		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file> 
    	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag-file>
-       <name>Etherpad</name>
-       <path>/WEB-INF/tags/Etherpad.tag</path>
-   	</tag-file> 
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
    	<tag-file>
-	    <name>errors</name>
-		<path>/WEB-INF/tags/Errors.tag</path>
-   	</tag-file> 
-   	<tag-file>
-	    <name>errors5</name>
-		<path>/WEB-INF/tags/Errors5.tag</path>
-   	</tag-file>    
-   	<tag-file>
-	    <name>Widget</name>
-		<path>/WEB-INF/tags/Widget.tag</path>
-   	</tag-file>   
-   	<tag-file>
 	    <name>Page5</name>
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
@@ -369,92 +350,71 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TSTable5</name>
-		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>  
+       <name>Popover</name>
+       <path>/WEB-INF/tags/Popover.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>WaitForLeader</name>
-		<path>/WEB-INF/tags/WaitForLeader.tag</path>
-   	</tag-file>  
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Alert5</name>
-		<path>/WEB-INF/tags/Alert5.tag</path>
-   	</tag-file>  
-   	<tag-file>
-       <name>FileUpload5</name>
-       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
-   	<tag>
-    <name>textarea</name>
-    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
-    <body-content>JSP</body-content>
-    <dynamic-attributes>true</dynamic-attributes>
-    <description>
-    	Render text exactly same as  original input, which even won't escape the input HTML tag.
-    </description>    
-    <attribute>
-        <description>
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>id</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>onchange</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>disabled</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-	<tag-file>
-		<name>head</name>
-	    <path>/WEB-INF/tags/Head.tag</path>
-	</tag-file>
-   	<tag-file>
-       <name>Comments</name>
-       <path>/WEB-INF/tags/Comments.tag</path>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>CommentsAuthor</name>
-       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
+   	</tag-file>    		
+   	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FileUpload</name>
-       <path>/WEB-INF/tags/FileUpload.tag</path>
+       <name>Switch</name>
+       <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>WaitingSpinner</name>
-       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>JSImport</name>
-       <path>/WEB-INF/tags/JSImport.tag</path>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Popover</name>
-       <path>/WEB-INF/tags/Popover.tag</path>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Input</name>
-       <path>/WEB-INF/tags/Input.tag</path>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Switch</name>
-       <path>/WEB-INF/tags/Switch.tag</path>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>TSTable5</name>
+		<path>/WEB-INF/tags/TSTable5.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
    	</tag-file>
+	<tag-file>
+	    <name>Widget</name>
+		<path>/WEB-INF/tags/Widget.tag</path>
+   	</tag-file> 
 </taglib>
\ No newline at end of file
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/LearningController.java
===================================================================
diff -u -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/LearningController.java	(.../LearningController.java)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/LearningController.java	(.../LearningController.java)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -299,10 +299,10 @@
 		if (entry == null) {
 		    // create new entry
 		    nbService.createNotebookEntry(toolSessionID, CoreNotebookConstants.NOTEBOOK_TOOL,
-			    NoticeboardConstants.TOOL_SIGNATURE, userID.intValue(), nbLearnerForm.getReflectionText());
+			    NoticeboardConstants.TOOL_SIGNATURE, userID.intValue(), nbLearnerForm.getEntryText());
 		} else {
 		    // update existing entry
-		    entry.setEntry(nbLearnerForm.getReflectionText());
+		    entry.setEntry(nbLearnerForm.getEntryText());
 		    entry.setLastModified(new Date());
 		    nbService.updateEntry(entry);
 		}
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbLearnerForm.java
===================================================================
diff -u -rb3b03858efeef1c37e36993757f56374a9f2b9f3 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbLearnerForm.java	(.../NbLearnerForm.java)	(revision b3b03858efeef1c37e36993757f56374a9f2b9f3)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbLearnerForm.java	(.../NbLearnerForm.java)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -26,16 +26,6 @@
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.tool.noticeboard.model.NoticeboardContent;
 
-/**
- * Creation Date: 19-05-05
- *
- *
- *
- *
- *
- *
- */
-
 public class NbLearnerForm {
 
     private static final long serialVersionUID = -669035956406254875L;
@@ -54,7 +44,7 @@
 
     private Boolean readOnly;
 
-    private String reflectionText;
+    private String entryText;
 
     /**
      * @return Returns the toolSessionID.
@@ -155,11 +145,11 @@
 	this.readOnly = readOnly;
     }
 
-    public String getReflectionText() {
-	return reflectionText;
+    public String getEntryText() {
+	return entryText;
     }
 
-    public void setReflectionText(String reflectionText) {
-	this.reflectionText = reflectionText;
+    public void setEntryText(String entryText) {
+	this.entryText = entryText;
     }
 }
\ No newline at end of file
Index: lams_tool_nb/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u
--- lams_tool_nb/web/WEB-INF/tags/Notebook.tag	(revision 0)
+++ lams_tool_nb/web/WEB-INF/tags/Notebook.tag	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -0,0 +1,108 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="instructions" required="true" rtexprvalue="true"%>
+<%@ attribute name="formActionUrl" required="true" rtexprvalue="true"%>
+<%@ attribute name="formModelAttribute" required="false" rtexprvalue="true"%>
+<c:if test="${empty formModelAttribute}">
+	<c:set var="formModelAttribute" value="reflectionForm" />
+</c:if>
+<%@ attribute name="isNextActivityButtonSupported" required="true" rtexprvalue="true"%>
+<%@ attribute name="isLastActivity" required="false" rtexprvalue="true"%>
+<%@ attribute name="hiddenInputs" required="false" rtexprvalue="true"%>
+<c:if test="${empty hiddenInputs}">
+	<c:set var="hiddenInputs" value="userID,sessionMapID" />
+</c:if>
+<%@ attribute name="isNbTool" required="false" rtexprvalue="true"%>
+<c:if test="${empty isNbTool}">
+	<c:set var="isNbTool" value="false" />
+</c:if>
+
+<%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
+<%-- Default value for I18N keys --%> 
+<c:if test="${empty notebookLabelKey}">
+	<c:set var="notebookLabelKey" value="label.notebook" />
+</c:if>
+<c:if test="${empty finishButtonLabelKey}">
+	<c:set var="finishButtonLabelKey" value="label.submit" />
+</c:if>
+<c:if test="${empty nextActivityButtonLabelKey}">
+	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+</c:if>
+
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
+		}
+		function submitForm() {
+			var f = document.getElementById('reflectionForm');
+			f.submit();
+		}
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+	
+	<div id="instructions" class="instructions">
+		<lams:out value="${instructions}" escapeHtml="true" />
+	</div>
+	<hr class="mx-5">
+
+	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
+			<form:hidden path="${hiddenInput}" />
+		</c:forTokens>	
+			
+		<lams:errors5/>
+		
+		<div class="container-lg">
+			<div class="card lcard lcard-no-borders shadow mb-3">
+				<div class="card-header lcard-header-button-border">
+					<fmt:message key="${notebookLabelKey}" />
+				</div>
+				<div class="card-body mb-3">
+					<fmt:message key="${notebookLabelKey}" var="notebookLabel"/>
+					<form:textarea aria-label="${notebookLabel}" aria-multiline="true"
+						aria-required="true" required="true" path="entryText"
+						cssClass="form-control" id="focused" rows="5"></form:textarea>
+				</div>
+			</div>
+	
+			<div class="activity-bottom-buttons">
+				<button name="finishButton" id="finishButton" class="btn btn-primary">
+					<c:choose>
+						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
+							<fmt:message key="${finishButtonLabelKey}" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="${nextActivityButtonLabelKey}" />
+						</c:otherwise>
+					</c:choose>
+				</buttun>
+			</div>
+		
+		</div>
+	</form:form>
+	
+	<c:if test="${isNbTool}">
+		<!-- 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="${toolSessionID}"
+						   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
+						   pageSize="10" sortBy="1" />
+		</c:if>
+		<!-- End comments -->
+	</c:if>
+
+</lams:PageLearner>
\ No newline at end of file
Index: lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r14a43ff0db3bd18db9a56dde9555420f04347c47 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
+++ lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -16,161 +16,123 @@
    </listener>
 
    <tag>
-
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
       <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
       <name>WebAppURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
       </icon>
       <name>help</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Help tag</description>
          <name>module</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>toolSignature</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>page</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>style</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
       </icon>
       <name>Configuration</name>
       <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Get the configuration value for the specified key</description>
          <name>key</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
       <name>LAMSURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
       </icon>
       <name>html</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
          <description>Render html tag with direction and language</description>
          <name>xhtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
       <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
       <name>out</name>
       <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>value</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>escapeHtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts role name into form usable as message resources key</description>
       <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
       <name>role</name>
       <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts role name into form usable as message resources key</description>
          <name>role</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -192,7 +154,6 @@
  	  </attribute>
    </tag>
    <tag>
-
       <description>Output details from the shared session UserDTO object</description>
       <display-name>user details</display-name>
       <icon>    
@@ -205,14 +166,9 @@
          <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
-
-	
 	<tag>
       <description>Small portrait of a user</description>
       <display-name>User Portrait</display-name>
@@ -243,32 +199,61 @@
          <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
       </attribute>
    </tag>
-	
-	<tag-file>
-       <name>Tab</name>
-       <path>/WEB-INF/tags/Tab.tag</path>
-   	</tag-file>
+   <tag>
+	    <name>textarea</name>
+	    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
+	    <body-content>JSP</body-content>
+	    <dynamic-attributes>true</dynamic-attributes>
+	    <description>
+	    	Render text exactly same as  original input, which even won't escape the input HTML tag.
+	    </description>    
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>name</name>
+	        <required>true</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>id</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>onchange</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>disabled</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+  	</tag>
+  	
    	<tag-file>
-       <name>Tabs</name>
-       <path>/WEB-INF/tags/Tabs.tag</path>
-   	</tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+   	</tag-file> 
    	<tag-file>
-       <name>TabBody</name>
-       <path>/WEB-INF/tags/TabBody.tag</path>
-   	</tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
    	<tag-file>
-       <name>TabBodys</name>
-       <path>/WEB-INF/tags/TabBodys.tag</path>
+	    <name>Alert5</name>
+		<path>/WEB-INF/tags/Alert5.tag</path>
+   	</tag-file> 
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>TabBodyArea</name>
-       <path>/WEB-INF/tags/TabBodyArea.tag</path>
-   	</tag-file>
-   	<tag-file>
-       <name>CKEditor</name>
-       <path>/WEB-INF/tags/CKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   
@@ -281,86 +266,82 @@
        <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Rating</name>
-       <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>    		
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>StyledRating</name>
-       <path>/WEB-INF/tags/StyledRating.tag</path>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>headItems</name>
-       <path>/WEB-INF/tags/headItems.tag</path>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
-   	</tag-file>  
+   	</tag-file> 
    	<tag-file>
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Alert</name>
-		<path>/WEB-INF/tags/Alert.tag</path>
-   	</tag-file>  
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Page</name>
-		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>
+	    <name>errors</name>
+		<path>/WEB-INF/tags/Errors.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>TSTable</name>
-		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>    
-  	<tag-file>
-	    <name>Arrow</name>
-		<path>/WEB-INF/tags/Arrow.tag</path>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>AdvancedAccordian</name>
-       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
-   	</tag-file>  
-   	<tag-file>
-   		<name>RestrictedUsageAccordian</name>
-   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
    	</tag-file>
-  	<tag-file>
-	    <name>SimplePanel</name>
-		<path>/WEB-INF/tags/SimplePanel.tag</path>
-   	</tag-file>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>
    	<tag-file>
+       <name>headItems</name>
+       <path>/WEB-INF/tags/headItems.tag</path>
+   	</tag-file> 
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TextSearch</name>
-		<path>/WEB-INF/tags/TextSearch.tag</path>
-   	</tag-file>  
+       <name>Input</name>
+       <path>/WEB-INF/tags/Input.tag</path>
+   	</tag-file>
    	<tag-file>
+       <name>JSImport</name>
+       <path>/WEB-INF/tags/JSImport.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Notebook</name>
+		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file> 
    	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag-file>
-       <name>Etherpad</name>
-       <path>/WEB-INF/tags/Etherpad.tag</path>
-   	</tag-file> 
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
    	<tag-file>
-	    <name>errors</name>
-		<path>/WEB-INF/tags/Errors.tag</path>
-   	</tag-file> 
-   	<tag-file>
-	    <name>errors5</name>
-		<path>/WEB-INF/tags/Errors5.tag</path>
-   	</tag-file>    
-   	<tag-file>
-	    <name>Widget</name>
-		<path>/WEB-INF/tags/Widget.tag</path>
-   	</tag-file>   
-   	<tag-file>
 	    <name>Page5</name>
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
@@ -369,92 +350,71 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TSTable5</name>
-		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>  
+       <name>Popover</name>
+       <path>/WEB-INF/tags/Popover.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>WaitForLeader</name>
-		<path>/WEB-INF/tags/WaitForLeader.tag</path>
-   	</tag-file>  
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Alert5</name>
-		<path>/WEB-INF/tags/Alert5.tag</path>
-   	</tag-file>  
-   	<tag-file>
-       <name>FileUpload5</name>
-       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
-   	<tag>
-    <name>textarea</name>
-    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
-    <body-content>JSP</body-content>
-    <dynamic-attributes>true</dynamic-attributes>
-    <description>
-    	Render text exactly same as  original input, which even won't escape the input HTML tag.
-    </description>    
-    <attribute>
-        <description>
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>id</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>onchange</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>disabled</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-	<tag-file>
-		<name>head</name>
-	    <path>/WEB-INF/tags/Head.tag</path>
-	</tag-file>
-   	<tag-file>
-       <name>Comments</name>
-       <path>/WEB-INF/tags/Comments.tag</path>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>CommentsAuthor</name>
-       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
+   	</tag-file>    		
+   	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FileUpload</name>
-       <path>/WEB-INF/tags/FileUpload.tag</path>
+       <name>Switch</name>
+       <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>WaitingSpinner</name>
-       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>JSImport</name>
-       <path>/WEB-INF/tags/JSImport.tag</path>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Popover</name>
-       <path>/WEB-INF/tags/Popover.tag</path>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Input</name>
-       <path>/WEB-INF/tags/Input.tag</path>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Switch</name>
-       <path>/WEB-INF/tags/Switch.tag</path>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>TSTable5</name>
+		<path>/WEB-INF/tags/TSTable5.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
    	</tag-file>
+	<tag-file>
+	    <name>Widget</name>
+		<path>/WEB-INF/tags/Widget.tag</path>
+   	</tag-file> 
 </taglib>
\ No newline at end of file
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
Index: lams_tool_notebook/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u
--- lams_tool_notebook/web/WEB-INF/tags/Notebook.tag	(revision 0)
+++ lams_tool_notebook/web/WEB-INF/tags/Notebook.tag	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -0,0 +1,108 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="instructions" required="true" rtexprvalue="true"%>
+<%@ attribute name="formActionUrl" required="true" rtexprvalue="true"%>
+<%@ attribute name="formModelAttribute" required="false" rtexprvalue="true"%>
+<c:if test="${empty formModelAttribute}">
+	<c:set var="formModelAttribute" value="reflectionForm" />
+</c:if>
+<%@ attribute name="isNextActivityButtonSupported" required="true" rtexprvalue="true"%>
+<%@ attribute name="isLastActivity" required="false" rtexprvalue="true"%>
+<%@ attribute name="hiddenInputs" required="false" rtexprvalue="true"%>
+<c:if test="${empty hiddenInputs}">
+	<c:set var="hiddenInputs" value="userID,sessionMapID" />
+</c:if>
+<%@ attribute name="isNbTool" required="false" rtexprvalue="true"%>
+<c:if test="${empty isNbTool}">
+	<c:set var="isNbTool" value="false" />
+</c:if>
+
+<%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
+<%-- Default value for I18N keys --%> 
+<c:if test="${empty notebookLabelKey}">
+	<c:set var="notebookLabelKey" value="label.notebook" />
+</c:if>
+<c:if test="${empty finishButtonLabelKey}">
+	<c:set var="finishButtonLabelKey" value="label.submit" />
+</c:if>
+<c:if test="${empty nextActivityButtonLabelKey}">
+	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+</c:if>
+
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
+		}
+		function submitForm() {
+			var f = document.getElementById('reflectionForm');
+			f.submit();
+		}
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+	
+	<div id="instructions" class="instructions">
+		<lams:out value="${instructions}" escapeHtml="true" />
+	</div>
+	<hr class="mx-5">
+
+	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
+			<form:hidden path="${hiddenInput}" />
+		</c:forTokens>	
+			
+		<lams:errors5/>
+		
+		<div class="container-lg">
+			<div class="card lcard lcard-no-borders shadow mb-3">
+				<div class="card-header lcard-header-button-border">
+					<fmt:message key="${notebookLabelKey}" />
+				</div>
+				<div class="card-body mb-3">
+					<fmt:message key="${notebookLabelKey}" var="notebookLabel"/>
+					<form:textarea aria-label="${notebookLabel}" aria-multiline="true"
+						aria-required="true" required="true" path="entryText"
+						cssClass="form-control" id="focused" rows="5"></form:textarea>
+				</div>
+			</div>
+	
+			<div class="activity-bottom-buttons">
+				<button name="finishButton" id="finishButton" class="btn btn-primary">
+					<c:choose>
+						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
+							<fmt:message key="${finishButtonLabelKey}" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="${nextActivityButtonLabelKey}" />
+						</c:otherwise>
+					</c:choose>
+				</buttun>
+			</div>
+		
+		</div>
+	</form:form>
+	
+	<c:if test="${isNbTool}">
+		<!-- 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="${toolSessionID}"
+						   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
+						   pageSize="10" sortBy="1" />
+		</c:if>
+		<!-- End comments -->
+	</c:if>
+
+</lams:PageLearner>
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r14a43ff0db3bd18db9a56dde9555420f04347c47 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
+++ lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -16,161 +16,123 @@
    </listener>
 
    <tag>
-
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
       <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
       <name>WebAppURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
       </icon>
       <name>help</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Help tag</description>
          <name>module</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>toolSignature</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>page</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>style</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
       </icon>
       <name>Configuration</name>
       <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Get the configuration value for the specified key</description>
          <name>key</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
       <name>LAMSURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
       </icon>
       <name>html</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
          <description>Render html tag with direction and language</description>
          <name>xhtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
       <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
       <name>out</name>
       <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>value</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>escapeHtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts role name into form usable as message resources key</description>
       <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
       <name>role</name>
       <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts role name into form usable as message resources key</description>
          <name>role</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -192,7 +154,6 @@
  	  </attribute>
    </tag>
    <tag>
-
       <description>Output details from the shared session UserDTO object</description>
       <display-name>user details</display-name>
       <icon>    
@@ -205,14 +166,9 @@
          <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
-
-	
 	<tag>
       <description>Small portrait of a user</description>
       <display-name>User Portrait</display-name>
@@ -243,32 +199,61 @@
          <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
       </attribute>
    </tag>
-	
-	<tag-file>
-       <name>Tab</name>
-       <path>/WEB-INF/tags/Tab.tag</path>
-   	</tag-file>
+   <tag>
+	    <name>textarea</name>
+	    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
+	    <body-content>JSP</body-content>
+	    <dynamic-attributes>true</dynamic-attributes>
+	    <description>
+	    	Render text exactly same as  original input, which even won't escape the input HTML tag.
+	    </description>    
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>name</name>
+	        <required>true</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>id</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>onchange</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>disabled</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+  	</tag>
+  	
    	<tag-file>
-       <name>Tabs</name>
-       <path>/WEB-INF/tags/Tabs.tag</path>
-   	</tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+   	</tag-file> 
    	<tag-file>
-       <name>TabBody</name>
-       <path>/WEB-INF/tags/TabBody.tag</path>
-   	</tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
    	<tag-file>
-       <name>TabBodys</name>
-       <path>/WEB-INF/tags/TabBodys.tag</path>
+	    <name>Alert5</name>
+		<path>/WEB-INF/tags/Alert5.tag</path>
+   	</tag-file> 
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>TabBodyArea</name>
-       <path>/WEB-INF/tags/TabBodyArea.tag</path>
-   	</tag-file>
-   	<tag-file>
-       <name>CKEditor</name>
-       <path>/WEB-INF/tags/CKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   
@@ -281,86 +266,82 @@
        <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Rating</name>
-       <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>    		
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>StyledRating</name>
-       <path>/WEB-INF/tags/StyledRating.tag</path>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>headItems</name>
-       <path>/WEB-INF/tags/headItems.tag</path>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
-   	</tag-file>  
+   	</tag-file> 
    	<tag-file>
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Alert</name>
-		<path>/WEB-INF/tags/Alert.tag</path>
-   	</tag-file>  
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Page</name>
-		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>
+	    <name>errors</name>
+		<path>/WEB-INF/tags/Errors.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>TSTable</name>
-		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>    
-  	<tag-file>
-	    <name>Arrow</name>
-		<path>/WEB-INF/tags/Arrow.tag</path>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>AdvancedAccordian</name>
-       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
-   	</tag-file>  
-   	<tag-file>
-   		<name>RestrictedUsageAccordian</name>
-   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
    	</tag-file>
-  	<tag-file>
-	    <name>SimplePanel</name>
-		<path>/WEB-INF/tags/SimplePanel.tag</path>
-   	</tag-file>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>
    	<tag-file>
+       <name>headItems</name>
+       <path>/WEB-INF/tags/headItems.tag</path>
+   	</tag-file> 
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TextSearch</name>
-		<path>/WEB-INF/tags/TextSearch.tag</path>
-   	</tag-file>  
+       <name>Input</name>
+       <path>/WEB-INF/tags/Input.tag</path>
+   	</tag-file>
    	<tag-file>
+       <name>JSImport</name>
+       <path>/WEB-INF/tags/JSImport.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Notebook</name>
+		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file> 
    	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag-file>
-       <name>Etherpad</name>
-       <path>/WEB-INF/tags/Etherpad.tag</path>
-   	</tag-file> 
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
    	<tag-file>
-	    <name>errors</name>
-		<path>/WEB-INF/tags/Errors.tag</path>
-   	</tag-file> 
-   	<tag-file>
-	    <name>errors5</name>
-		<path>/WEB-INF/tags/Errors5.tag</path>
-   	</tag-file>    
-   	<tag-file>
-	    <name>Widget</name>
-		<path>/WEB-INF/tags/Widget.tag</path>
-   	</tag-file>   
-   	<tag-file>
 	    <name>Page5</name>
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
@@ -369,92 +350,71 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TSTable5</name>
-		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>  
+       <name>Popover</name>
+       <path>/WEB-INF/tags/Popover.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>WaitForLeader</name>
-		<path>/WEB-INF/tags/WaitForLeader.tag</path>
-   	</tag-file>  
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Alert5</name>
-		<path>/WEB-INF/tags/Alert5.tag</path>
-   	</tag-file>  
-   	<tag-file>
-       <name>FileUpload5</name>
-       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
-   	<tag>
-    <name>textarea</name>
-    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
-    <body-content>JSP</body-content>
-    <dynamic-attributes>true</dynamic-attributes>
-    <description>
-    	Render text exactly same as  original input, which even won't escape the input HTML tag.
-    </description>    
-    <attribute>
-        <description>
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>id</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>onchange</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>disabled</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-	<tag-file>
-		<name>head</name>
-	    <path>/WEB-INF/tags/Head.tag</path>
-	</tag-file>
-   	<tag-file>
-       <name>Comments</name>
-       <path>/WEB-INF/tags/Comments.tag</path>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>CommentsAuthor</name>
-       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
+   	</tag-file>    		
+   	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FileUpload</name>
-       <path>/WEB-INF/tags/FileUpload.tag</path>
+       <name>Switch</name>
+       <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>WaitingSpinner</name>
-       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>JSImport</name>
-       <path>/WEB-INF/tags/JSImport.tag</path>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Popover</name>
-       <path>/WEB-INF/tags/Popover.tag</path>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Input</name>
-       <path>/WEB-INF/tags/Input.tag</path>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Switch</name>
-       <path>/WEB-INF/tags/Switch.tag</path>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>TSTable5</name>
+		<path>/WEB-INF/tags/TSTable5.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
    	</tag-file>
+	<tag-file>
+	    <name>Widget</name>
+		<path>/WEB-INF/tags/Widget.tag</path>
+   	</tag-file> 
 </taglib>
\ No newline at end of file
Index: lams_tool_pixlr/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u
--- lams_tool_pixlr/web/WEB-INF/tags/Notebook.tag	(revision 0)
+++ lams_tool_pixlr/web/WEB-INF/tags/Notebook.tag	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -0,0 +1,108 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="instructions" required="true" rtexprvalue="true"%>
+<%@ attribute name="formActionUrl" required="true" rtexprvalue="true"%>
+<%@ attribute name="formModelAttribute" required="false" rtexprvalue="true"%>
+<c:if test="${empty formModelAttribute}">
+	<c:set var="formModelAttribute" value="reflectionForm" />
+</c:if>
+<%@ attribute name="isNextActivityButtonSupported" required="true" rtexprvalue="true"%>
+<%@ attribute name="isLastActivity" required="false" rtexprvalue="true"%>
+<%@ attribute name="hiddenInputs" required="false" rtexprvalue="true"%>
+<c:if test="${empty hiddenInputs}">
+	<c:set var="hiddenInputs" value="userID,sessionMapID" />
+</c:if>
+<%@ attribute name="isNbTool" required="false" rtexprvalue="true"%>
+<c:if test="${empty isNbTool}">
+	<c:set var="isNbTool" value="false" />
+</c:if>
+
+<%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
+<%-- Default value for I18N keys --%> 
+<c:if test="${empty notebookLabelKey}">
+	<c:set var="notebookLabelKey" value="label.notebook" />
+</c:if>
+<c:if test="${empty finishButtonLabelKey}">
+	<c:set var="finishButtonLabelKey" value="label.submit" />
+</c:if>
+<c:if test="${empty nextActivityButtonLabelKey}">
+	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+</c:if>
+
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
+		}
+		function submitForm() {
+			var f = document.getElementById('reflectionForm');
+			f.submit();
+		}
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+	
+	<div id="instructions" class="instructions">
+		<lams:out value="${instructions}" escapeHtml="true" />
+	</div>
+	<hr class="mx-5">
+
+	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
+			<form:hidden path="${hiddenInput}" />
+		</c:forTokens>	
+			
+		<lams:errors5/>
+		
+		<div class="container-lg">
+			<div class="card lcard lcard-no-borders shadow mb-3">
+				<div class="card-header lcard-header-button-border">
+					<fmt:message key="${notebookLabelKey}" />
+				</div>
+				<div class="card-body mb-3">
+					<fmt:message key="${notebookLabelKey}" var="notebookLabel"/>
+					<form:textarea aria-label="${notebookLabel}" aria-multiline="true"
+						aria-required="true" required="true" path="entryText"
+						cssClass="form-control" id="focused" rows="5"></form:textarea>
+				</div>
+			</div>
+	
+			<div class="activity-bottom-buttons">
+				<button name="finishButton" id="finishButton" class="btn btn-primary">
+					<c:choose>
+						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
+							<fmt:message key="${finishButtonLabelKey}" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="${nextActivityButtonLabelKey}" />
+						</c:otherwise>
+					</c:choose>
+				</buttun>
+			</div>
+		
+		</div>
+	</form:form>
+	
+	<c:if test="${isNbTool}">
+		<!-- 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="${toolSessionID}"
+						   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
+						   pageSize="10" sortBy="1" />
+		</c:if>
+		<!-- End comments -->
+	</c:if>
+
+</lams:PageLearner>
\ No newline at end of file
Index: lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r14a43ff0db3bd18db9a56dde9555420f04347c47 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
+++ lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -16,161 +16,123 @@
    </listener>
 
    <tag>
-
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
       <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
       <name>WebAppURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
       </icon>
       <name>help</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Help tag</description>
          <name>module</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>toolSignature</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>page</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>style</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
       </icon>
       <name>Configuration</name>
       <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Get the configuration value for the specified key</description>
          <name>key</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
       <name>LAMSURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
       </icon>
       <name>html</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
          <description>Render html tag with direction and language</description>
          <name>xhtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
       <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
       <name>out</name>
       <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>value</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>escapeHtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts role name into form usable as message resources key</description>
       <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
       <name>role</name>
       <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts role name into form usable as message resources key</description>
          <name>role</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -192,7 +154,6 @@
  	  </attribute>
    </tag>
    <tag>
-
       <description>Output details from the shared session UserDTO object</description>
       <display-name>user details</display-name>
       <icon>    
@@ -205,14 +166,9 @@
          <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
-
-	
 	<tag>
       <description>Small portrait of a user</description>
       <display-name>User Portrait</display-name>
@@ -243,32 +199,61 @@
          <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
       </attribute>
    </tag>
-	
-	<tag-file>
-       <name>Tab</name>
-       <path>/WEB-INF/tags/Tab.tag</path>
-   	</tag-file>
+   <tag>
+	    <name>textarea</name>
+	    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
+	    <body-content>JSP</body-content>
+	    <dynamic-attributes>true</dynamic-attributes>
+	    <description>
+	    	Render text exactly same as  original input, which even won't escape the input HTML tag.
+	    </description>    
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>name</name>
+	        <required>true</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>id</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>onchange</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>disabled</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+  	</tag>
+  	
    	<tag-file>
-       <name>Tabs</name>
-       <path>/WEB-INF/tags/Tabs.tag</path>
-   	</tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+   	</tag-file> 
    	<tag-file>
-       <name>TabBody</name>
-       <path>/WEB-INF/tags/TabBody.tag</path>
-   	</tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
    	<tag-file>
-       <name>TabBodys</name>
-       <path>/WEB-INF/tags/TabBodys.tag</path>
+	    <name>Alert5</name>
+		<path>/WEB-INF/tags/Alert5.tag</path>
+   	</tag-file> 
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>TabBodyArea</name>
-       <path>/WEB-INF/tags/TabBodyArea.tag</path>
-   	</tag-file>
-   	<tag-file>
-       <name>CKEditor</name>
-       <path>/WEB-INF/tags/CKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   
@@ -281,86 +266,82 @@
        <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Rating</name>
-       <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>    		
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>StyledRating</name>
-       <path>/WEB-INF/tags/StyledRating.tag</path>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>headItems</name>
-       <path>/WEB-INF/tags/headItems.tag</path>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
-   	</tag-file>  
+   	</tag-file> 
    	<tag-file>
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Alert</name>
-		<path>/WEB-INF/tags/Alert.tag</path>
-   	</tag-file>  
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Page</name>
-		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>
+	    <name>errors</name>
+		<path>/WEB-INF/tags/Errors.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>TSTable</name>
-		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>    
-  	<tag-file>
-	    <name>Arrow</name>
-		<path>/WEB-INF/tags/Arrow.tag</path>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>AdvancedAccordian</name>
-       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
-   	</tag-file>  
-   	<tag-file>
-   		<name>RestrictedUsageAccordian</name>
-   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
    	</tag-file>
-  	<tag-file>
-	    <name>SimplePanel</name>
-		<path>/WEB-INF/tags/SimplePanel.tag</path>
-   	</tag-file>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>
    	<tag-file>
+       <name>headItems</name>
+       <path>/WEB-INF/tags/headItems.tag</path>
+   	</tag-file> 
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TextSearch</name>
-		<path>/WEB-INF/tags/TextSearch.tag</path>
-   	</tag-file>  
+       <name>Input</name>
+       <path>/WEB-INF/tags/Input.tag</path>
+   	</tag-file>
    	<tag-file>
+       <name>JSImport</name>
+       <path>/WEB-INF/tags/JSImport.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Notebook</name>
+		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file> 
    	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag-file>
-       <name>Etherpad</name>
-       <path>/WEB-INF/tags/Etherpad.tag</path>
-   	</tag-file> 
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
    	<tag-file>
-	    <name>errors</name>
-		<path>/WEB-INF/tags/Errors.tag</path>
-   	</tag-file> 
-   	<tag-file>
-	    <name>errors5</name>
-		<path>/WEB-INF/tags/Errors5.tag</path>
-   	</tag-file>    
-   	<tag-file>
-	    <name>Widget</name>
-		<path>/WEB-INF/tags/Widget.tag</path>
-   	</tag-file>   
-   	<tag-file>
 	    <name>Page5</name>
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
@@ -369,92 +350,71 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TSTable5</name>
-		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>  
+       <name>Popover</name>
+       <path>/WEB-INF/tags/Popover.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>WaitForLeader</name>
-		<path>/WEB-INF/tags/WaitForLeader.tag</path>
-   	</tag-file>  
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Alert5</name>
-		<path>/WEB-INF/tags/Alert5.tag</path>
-   	</tag-file>  
-   	<tag-file>
-       <name>FileUpload5</name>
-       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
-   	<tag>
-    <name>textarea</name>
-    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
-    <body-content>JSP</body-content>
-    <dynamic-attributes>true</dynamic-attributes>
-    <description>
-    	Render text exactly same as  original input, which even won't escape the input HTML tag.
-    </description>    
-    <attribute>
-        <description>
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>id</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>onchange</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>disabled</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-	<tag-file>
-		<name>head</name>
-	    <path>/WEB-INF/tags/Head.tag</path>
-	</tag-file>
-   	<tag-file>
-       <name>Comments</name>
-       <path>/WEB-INF/tags/Comments.tag</path>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>CommentsAuthor</name>
-       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
+   	</tag-file>    		
+   	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FileUpload</name>
-       <path>/WEB-INF/tags/FileUpload.tag</path>
+       <name>Switch</name>
+       <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>WaitingSpinner</name>
-       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>JSImport</name>
-       <path>/WEB-INF/tags/JSImport.tag</path>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Popover</name>
-       <path>/WEB-INF/tags/Popover.tag</path>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Input</name>
-       <path>/WEB-INF/tags/Input.tag</path>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Switch</name>
-       <path>/WEB-INF/tags/Switch.tag</path>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>TSTable5</name>
+		<path>/WEB-INF/tags/TSTable5.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
    	</tag-file>
+	<tag-file>
+	    <name>Widget</name>
+		<path>/WEB-INF/tags/Widget.tag</path>
+   	</tag-file> 
 </taglib>
\ No newline at end of file
Index: lams_tool_preview/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u
--- lams_tool_preview/web/WEB-INF/tags/Notebook.tag	(revision 0)
+++ lams_tool_preview/web/WEB-INF/tags/Notebook.tag	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -0,0 +1,108 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="instructions" required="true" rtexprvalue="true"%>
+<%@ attribute name="formActionUrl" required="true" rtexprvalue="true"%>
+<%@ attribute name="formModelAttribute" required="false" rtexprvalue="true"%>
+<c:if test="${empty formModelAttribute}">
+	<c:set var="formModelAttribute" value="reflectionForm" />
+</c:if>
+<%@ attribute name="isNextActivityButtonSupported" required="true" rtexprvalue="true"%>
+<%@ attribute name="isLastActivity" required="false" rtexprvalue="true"%>
+<%@ attribute name="hiddenInputs" required="false" rtexprvalue="true"%>
+<c:if test="${empty hiddenInputs}">
+	<c:set var="hiddenInputs" value="userID,sessionMapID" />
+</c:if>
+<%@ attribute name="isNbTool" required="false" rtexprvalue="true"%>
+<c:if test="${empty isNbTool}">
+	<c:set var="isNbTool" value="false" />
+</c:if>
+
+<%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
+<%-- Default value for I18N keys --%> 
+<c:if test="${empty notebookLabelKey}">
+	<c:set var="notebookLabelKey" value="label.notebook" />
+</c:if>
+<c:if test="${empty finishButtonLabelKey}">
+	<c:set var="finishButtonLabelKey" value="label.submit" />
+</c:if>
+<c:if test="${empty nextActivityButtonLabelKey}">
+	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+</c:if>
+
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
+		}
+		function submitForm() {
+			var f = document.getElementById('reflectionForm');
+			f.submit();
+		}
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+	
+	<div id="instructions" class="instructions">
+		<lams:out value="${instructions}" escapeHtml="true" />
+	</div>
+	<hr class="mx-5">
+
+	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
+			<form:hidden path="${hiddenInput}" />
+		</c:forTokens>	
+			
+		<lams:errors5/>
+		
+		<div class="container-lg">
+			<div class="card lcard lcard-no-borders shadow mb-3">
+				<div class="card-header lcard-header-button-border">
+					<fmt:message key="${notebookLabelKey}" />
+				</div>
+				<div class="card-body mb-3">
+					<fmt:message key="${notebookLabelKey}" var="notebookLabel"/>
+					<form:textarea aria-label="${notebookLabel}" aria-multiline="true"
+						aria-required="true" required="true" path="entryText"
+						cssClass="form-control" id="focused" rows="5"></form:textarea>
+				</div>
+			</div>
+	
+			<div class="activity-bottom-buttons">
+				<button name="finishButton" id="finishButton" class="btn btn-primary">
+					<c:choose>
+						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
+							<fmt:message key="${finishButtonLabelKey}" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="${nextActivityButtonLabelKey}" />
+						</c:otherwise>
+					</c:choose>
+				</buttun>
+			</div>
+		
+		</div>
+	</form:form>
+	
+	<c:if test="${isNbTool}">
+		<!-- 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="${toolSessionID}"
+						   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
+						   pageSize="10" sortBy="1" />
+		</c:if>
+		<!-- End comments -->
+	</c:if>
+
+</lams:PageLearner>
\ No newline at end of file
Index: lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r14a43ff0db3bd18db9a56dde9555420f04347c47 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
+++ lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -16,161 +16,123 @@
    </listener>
 
    <tag>
-
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
       <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
       <name>WebAppURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
       </icon>
       <name>help</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Help tag</description>
          <name>module</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>toolSignature</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>page</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>style</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
       </icon>
       <name>Configuration</name>
       <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Get the configuration value for the specified key</description>
          <name>key</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
       <name>LAMSURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
       </icon>
       <name>html</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
          <description>Render html tag with direction and language</description>
          <name>xhtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
       <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
       <name>out</name>
       <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>value</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>escapeHtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts role name into form usable as message resources key</description>
       <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
       <name>role</name>
       <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts role name into form usable as message resources key</description>
          <name>role</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -192,7 +154,6 @@
  	  </attribute>
    </tag>
    <tag>
-
       <description>Output details from the shared session UserDTO object</description>
       <display-name>user details</display-name>
       <icon>    
@@ -205,14 +166,9 @@
          <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
-
-	
 	<tag>
       <description>Small portrait of a user</description>
       <display-name>User Portrait</display-name>
@@ -243,32 +199,61 @@
          <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
       </attribute>
    </tag>
-	
-	<tag-file>
-       <name>Tab</name>
-       <path>/WEB-INF/tags/Tab.tag</path>
-   	</tag-file>
+   <tag>
+	    <name>textarea</name>
+	    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
+	    <body-content>JSP</body-content>
+	    <dynamic-attributes>true</dynamic-attributes>
+	    <description>
+	    	Render text exactly same as  original input, which even won't escape the input HTML tag.
+	    </description>    
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>name</name>
+	        <required>true</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>id</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>onchange</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>disabled</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+  	</tag>
+  	
    	<tag-file>
-       <name>Tabs</name>
-       <path>/WEB-INF/tags/Tabs.tag</path>
-   	</tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+   	</tag-file> 
    	<tag-file>
-       <name>TabBody</name>
-       <path>/WEB-INF/tags/TabBody.tag</path>
-   	</tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
    	<tag-file>
-       <name>TabBodys</name>
-       <path>/WEB-INF/tags/TabBodys.tag</path>
+	    <name>Alert5</name>
+		<path>/WEB-INF/tags/Alert5.tag</path>
+   	</tag-file> 
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>TabBodyArea</name>
-       <path>/WEB-INF/tags/TabBodyArea.tag</path>
-   	</tag-file>
-   	<tag-file>
-       <name>CKEditor</name>
-       <path>/WEB-INF/tags/CKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   
@@ -281,86 +266,82 @@
        <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Rating</name>
-       <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>    		
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>StyledRating</name>
-       <path>/WEB-INF/tags/StyledRating.tag</path>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>headItems</name>
-       <path>/WEB-INF/tags/headItems.tag</path>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
-   	</tag-file>  
+   	</tag-file> 
    	<tag-file>
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Alert</name>
-		<path>/WEB-INF/tags/Alert.tag</path>
-   	</tag-file>  
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Page</name>
-		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>
+	    <name>errors</name>
+		<path>/WEB-INF/tags/Errors.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>TSTable</name>
-		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>    
-  	<tag-file>
-	    <name>Arrow</name>
-		<path>/WEB-INF/tags/Arrow.tag</path>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>AdvancedAccordian</name>
-       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
-   	</tag-file>  
-   	<tag-file>
-   		<name>RestrictedUsageAccordian</name>
-   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
    	</tag-file>
-  	<tag-file>
-	    <name>SimplePanel</name>
-		<path>/WEB-INF/tags/SimplePanel.tag</path>
-   	</tag-file>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>
    	<tag-file>
+       <name>headItems</name>
+       <path>/WEB-INF/tags/headItems.tag</path>
+   	</tag-file> 
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TextSearch</name>
-		<path>/WEB-INF/tags/TextSearch.tag</path>
-   	</tag-file>  
+       <name>Input</name>
+       <path>/WEB-INF/tags/Input.tag</path>
+   	</tag-file>
    	<tag-file>
+       <name>JSImport</name>
+       <path>/WEB-INF/tags/JSImport.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Notebook</name>
+		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file> 
    	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag-file>
-       <name>Etherpad</name>
-       <path>/WEB-INF/tags/Etherpad.tag</path>
-   	</tag-file> 
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
    	<tag-file>
-	    <name>errors</name>
-		<path>/WEB-INF/tags/Errors.tag</path>
-   	</tag-file> 
-   	<tag-file>
-	    <name>errors5</name>
-		<path>/WEB-INF/tags/Errors5.tag</path>
-   	</tag-file>    
-   	<tag-file>
-	    <name>Widget</name>
-		<path>/WEB-INF/tags/Widget.tag</path>
-   	</tag-file>   
-   	<tag-file>
 	    <name>Page5</name>
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
@@ -369,92 +350,71 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TSTable5</name>
-		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>  
+       <name>Popover</name>
+       <path>/WEB-INF/tags/Popover.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>WaitForLeader</name>
-		<path>/WEB-INF/tags/WaitForLeader.tag</path>
-   	</tag-file>  
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Alert5</name>
-		<path>/WEB-INF/tags/Alert5.tag</path>
-   	</tag-file>  
-   	<tag-file>
-       <name>FileUpload5</name>
-       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
-   	<tag>
-    <name>textarea</name>
-    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
-    <body-content>JSP</body-content>
-    <dynamic-attributes>true</dynamic-attributes>
-    <description>
-    	Render text exactly same as  original input, which even won't escape the input HTML tag.
-    </description>    
-    <attribute>
-        <description>
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>id</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>onchange</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>disabled</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-	<tag-file>
-		<name>head</name>
-	    <path>/WEB-INF/tags/Head.tag</path>
-	</tag-file>
-   	<tag-file>
-       <name>Comments</name>
-       <path>/WEB-INF/tags/Comments.tag</path>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>CommentsAuthor</name>
-       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
+   	</tag-file>    		
+   	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FileUpload</name>
-       <path>/WEB-INF/tags/FileUpload.tag</path>
+       <name>Switch</name>
+       <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>WaitingSpinner</name>
-       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>JSImport</name>
-       <path>/WEB-INF/tags/JSImport.tag</path>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Popover</name>
-       <path>/WEB-INF/tags/Popover.tag</path>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Input</name>
-       <path>/WEB-INF/tags/Input.tag</path>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Switch</name>
-       <path>/WEB-INF/tags/Switch.tag</path>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>TSTable5</name>
+		<path>/WEB-INF/tags/TSTable5.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
    	</tag-file>
+	<tag-file>
+	    <name>Widget</name>
+		<path>/WEB-INF/tags/Widget.tag</path>
+   	</tag-file> 
 </taglib>
\ No newline at end of file
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearningController.java
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearningController.java	(.../LearningController.java)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearningController.java	(.../LearningController.java)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -533,7 +533,7 @@
      * Display empty reflection form.
      */
     @RequestMapping("/newReflection")
-    public String newReflection(@ModelAttribute("refForm") ReflectionForm refForm, HttpServletRequest request,
+    public String newReflection(@ModelAttribute("reflectionForm") ReflectionForm refForm, HttpServletRequest request,
 	    HttpServletResponse response) {
 
 //		ISubmitFilesService submitFilesService = getService();
@@ -571,7 +571,7 @@
      * Submit reflection form input database.
      */
     @RequestMapping("/submitReflection")
-    public String submitReflection(@ModelAttribute("refForm") ReflectionForm refForm, HttpServletRequest request,
+    public String submitReflection(@ModelAttribute("reflectionForm") ReflectionForm refForm, HttpServletRequest request,
 	    HttpServletResponse response) {
 	Integer userId = refForm.getUserID();
 
Index: lams_tool_sbmt/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u
--- lams_tool_sbmt/web/WEB-INF/tags/Notebook.tag	(revision 0)
+++ lams_tool_sbmt/web/WEB-INF/tags/Notebook.tag	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -0,0 +1,108 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="instructions" required="true" rtexprvalue="true"%>
+<%@ attribute name="formActionUrl" required="true" rtexprvalue="true"%>
+<%@ attribute name="formModelAttribute" required="false" rtexprvalue="true"%>
+<c:if test="${empty formModelAttribute}">
+	<c:set var="formModelAttribute" value="reflectionForm" />
+</c:if>
+<%@ attribute name="isNextActivityButtonSupported" required="true" rtexprvalue="true"%>
+<%@ attribute name="isLastActivity" required="false" rtexprvalue="true"%>
+<%@ attribute name="hiddenInputs" required="false" rtexprvalue="true"%>
+<c:if test="${empty hiddenInputs}">
+	<c:set var="hiddenInputs" value="userID,sessionMapID" />
+</c:if>
+<%@ attribute name="isNbTool" required="false" rtexprvalue="true"%>
+<c:if test="${empty isNbTool}">
+	<c:set var="isNbTool" value="false" />
+</c:if>
+
+<%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
+<%-- Default value for I18N keys --%> 
+<c:if test="${empty notebookLabelKey}">
+	<c:set var="notebookLabelKey" value="label.notebook" />
+</c:if>
+<c:if test="${empty finishButtonLabelKey}">
+	<c:set var="finishButtonLabelKey" value="label.submit" />
+</c:if>
+<c:if test="${empty nextActivityButtonLabelKey}">
+	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+</c:if>
+
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
+		}
+		function submitForm() {
+			var f = document.getElementById('reflectionForm');
+			f.submit();
+		}
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+	
+	<div id="instructions" class="instructions">
+		<lams:out value="${instructions}" escapeHtml="true" />
+	</div>
+	<hr class="mx-5">
+
+	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
+			<form:hidden path="${hiddenInput}" />
+		</c:forTokens>	
+			
+		<lams:errors5/>
+		
+		<div class="container-lg">
+			<div class="card lcard lcard-no-borders shadow mb-3">
+				<div class="card-header lcard-header-button-border">
+					<fmt:message key="${notebookLabelKey}" />
+				</div>
+				<div class="card-body mb-3">
+					<fmt:message key="${notebookLabelKey}" var="notebookLabel"/>
+					<form:textarea aria-label="${notebookLabel}" aria-multiline="true"
+						aria-required="true" required="true" path="entryText"
+						cssClass="form-control" id="focused" rows="5"></form:textarea>
+				</div>
+			</div>
+	
+			<div class="activity-bottom-buttons">
+				<button name="finishButton" id="finishButton" class="btn btn-primary">
+					<c:choose>
+						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
+							<fmt:message key="${finishButtonLabelKey}" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="${nextActivityButtonLabelKey}" />
+						</c:otherwise>
+					</c:choose>
+				</buttun>
+			</div>
+		
+		</div>
+	</form:form>
+	
+	<c:if test="${isNbTool}">
+		<!-- 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="${toolSessionID}"
+						   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
+						   pageSize="10" sortBy="1" />
+		</c:if>
+		<!-- End comments -->
+	</c:if>
+
+</lams:PageLearner>
\ No newline at end of file
Index: lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r14a43ff0db3bd18db9a56dde9555420f04347c47 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
+++ lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -16,161 +16,123 @@
    </listener>
 
    <tag>
-
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
       <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
       <name>WebAppURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
       </icon>
       <name>help</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Help tag</description>
          <name>module</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>toolSignature</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>page</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>style</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
       </icon>
       <name>Configuration</name>
       <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Get the configuration value for the specified key</description>
          <name>key</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
       <name>LAMSURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
       </icon>
       <name>html</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
          <description>Render html tag with direction and language</description>
          <name>xhtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
       <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
       <name>out</name>
       <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>value</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>escapeHtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts role name into form usable as message resources key</description>
       <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
       <name>role</name>
       <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts role name into form usable as message resources key</description>
          <name>role</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -192,7 +154,6 @@
  	  </attribute>
    </tag>
    <tag>
-
       <description>Output details from the shared session UserDTO object</description>
       <display-name>user details</display-name>
       <icon>    
@@ -205,14 +166,9 @@
          <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
-
-	
 	<tag>
       <description>Small portrait of a user</description>
       <display-name>User Portrait</display-name>
@@ -243,32 +199,61 @@
          <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
       </attribute>
    </tag>
-	
-	<tag-file>
-       <name>Tab</name>
-       <path>/WEB-INF/tags/Tab.tag</path>
-   	</tag-file>
+   <tag>
+	    <name>textarea</name>
+	    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
+	    <body-content>JSP</body-content>
+	    <dynamic-attributes>true</dynamic-attributes>
+	    <description>
+	    	Render text exactly same as  original input, which even won't escape the input HTML tag.
+	    </description>    
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>name</name>
+	        <required>true</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>id</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>onchange</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>disabled</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+  	</tag>
+  	
    	<tag-file>
-       <name>Tabs</name>
-       <path>/WEB-INF/tags/Tabs.tag</path>
-   	</tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+   	</tag-file> 
    	<tag-file>
-       <name>TabBody</name>
-       <path>/WEB-INF/tags/TabBody.tag</path>
-   	</tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
    	<tag-file>
-       <name>TabBodys</name>
-       <path>/WEB-INF/tags/TabBodys.tag</path>
+	    <name>Alert5</name>
+		<path>/WEB-INF/tags/Alert5.tag</path>
+   	</tag-file> 
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>TabBodyArea</name>
-       <path>/WEB-INF/tags/TabBodyArea.tag</path>
-   	</tag-file>
-   	<tag-file>
-       <name>CKEditor</name>
-       <path>/WEB-INF/tags/CKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   
@@ -281,86 +266,82 @@
        <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Rating</name>
-       <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>    		
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>StyledRating</name>
-       <path>/WEB-INF/tags/StyledRating.tag</path>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>headItems</name>
-       <path>/WEB-INF/tags/headItems.tag</path>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
-   	</tag-file>  
+   	</tag-file> 
    	<tag-file>
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Alert</name>
-		<path>/WEB-INF/tags/Alert.tag</path>
-   	</tag-file>  
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Page</name>
-		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>
+	    <name>errors</name>
+		<path>/WEB-INF/tags/Errors.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>TSTable</name>
-		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>    
-  	<tag-file>
-	    <name>Arrow</name>
-		<path>/WEB-INF/tags/Arrow.tag</path>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>AdvancedAccordian</name>
-       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
-   	</tag-file>  
-   	<tag-file>
-   		<name>RestrictedUsageAccordian</name>
-   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
    	</tag-file>
-  	<tag-file>
-	    <name>SimplePanel</name>
-		<path>/WEB-INF/tags/SimplePanel.tag</path>
-   	</tag-file>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>
    	<tag-file>
+       <name>headItems</name>
+       <path>/WEB-INF/tags/headItems.tag</path>
+   	</tag-file> 
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TextSearch</name>
-		<path>/WEB-INF/tags/TextSearch.tag</path>
-   	</tag-file>  
+       <name>Input</name>
+       <path>/WEB-INF/tags/Input.tag</path>
+   	</tag-file>
    	<tag-file>
+       <name>JSImport</name>
+       <path>/WEB-INF/tags/JSImport.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Notebook</name>
+		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file> 
    	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag-file>
-       <name>Etherpad</name>
-       <path>/WEB-INF/tags/Etherpad.tag</path>
-   	</tag-file> 
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
    	<tag-file>
-	    <name>errors</name>
-		<path>/WEB-INF/tags/Errors.tag</path>
-   	</tag-file> 
-   	<tag-file>
-	    <name>errors5</name>
-		<path>/WEB-INF/tags/Errors5.tag</path>
-   	</tag-file>    
-   	<tag-file>
-	    <name>Widget</name>
-		<path>/WEB-INF/tags/Widget.tag</path>
-   	</tag-file>   
-   	<tag-file>
 	    <name>Page5</name>
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
@@ -369,92 +350,71 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TSTable5</name>
-		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>  
+       <name>Popover</name>
+       <path>/WEB-INF/tags/Popover.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>WaitForLeader</name>
-		<path>/WEB-INF/tags/WaitForLeader.tag</path>
-   	</tag-file>  
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Alert5</name>
-		<path>/WEB-INF/tags/Alert5.tag</path>
-   	</tag-file>  
-   	<tag-file>
-       <name>FileUpload5</name>
-       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
-   	<tag>
-    <name>textarea</name>
-    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
-    <body-content>JSP</body-content>
-    <dynamic-attributes>true</dynamic-attributes>
-    <description>
-    	Render text exactly same as  original input, which even won't escape the input HTML tag.
-    </description>    
-    <attribute>
-        <description>
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>id</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>onchange</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>disabled</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-	<tag-file>
-		<name>head</name>
-	    <path>/WEB-INF/tags/Head.tag</path>
-	</tag-file>
-   	<tag-file>
-       <name>Comments</name>
-       <path>/WEB-INF/tags/Comments.tag</path>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>CommentsAuthor</name>
-       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
+   	</tag-file>    		
+   	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FileUpload</name>
-       <path>/WEB-INF/tags/FileUpload.tag</path>
+       <name>Switch</name>
+       <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>WaitingSpinner</name>
-       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>JSImport</name>
-       <path>/WEB-INF/tags/JSImport.tag</path>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Popover</name>
-       <path>/WEB-INF/tags/Popover.tag</path>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Input</name>
-       <path>/WEB-INF/tags/Input.tag</path>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Switch</name>
-       <path>/WEB-INF/tags/Switch.tag</path>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>TSTable5</name>
+		<path>/WEB-INF/tags/TSTable5.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
    	</tag-file>
+	<tag-file>
+	    <name>Widget</name>
+		<path>/WEB-INF/tags/Widget.tag</path>
+   	</tag-file> 
 </taglib>
\ No newline at end of file
Index: lams_tool_sbmt/web/learner/notebook.jsp
===================================================================
diff -u -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_tool_sbmt/web/learner/notebook.jsp	(.../notebook.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
+++ lams_tool_sbmt/web/learner/notebook.jsp	(.../notebook.jsp)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -1,55 +1,13 @@
 <!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
-
-<c:set var="sessionMapID" value="${param.sessionMapID}" />
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
-<fmt:message key="title.reflection" var="reflectionLabel"/>
 
-<lams:PageLearner title="${sessionMap.title}" toolSessionID="${sessionMap.toolSessionID}" >
-	<script type="text/javascript">
-		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
-		}
-	</script>
-
-	<lams:errors5/>
-
-	<div id="instructions" class="instructions">
-		<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">
-				<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 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>
-
-				</button>
-			</div>
-		</div>
-	</form:form>
-
-</lams:PageLearner>
\ No newline at end of file
+<lams:Notebook title="${sessionMap.title}"
+	toolSessionID="${sessionMap.toolSessionID}"
+	instructions="${sessionMap.reflectInstructions}"
+	formActionUrl="submitReflection.do"
+	notebookLabelKey="title.reflection"
+	isNextActivityButtonSupported="true"
+	isLastActivity="${isLastActivity}"
+	finishButtonLabelKey="button.submit"
+	nextActivityButtonLabelKey="button.finish"/>
Index: lams_tool_scratchie/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u
--- lams_tool_scratchie/web/WEB-INF/tags/Notebook.tag	(revision 0)
+++ lams_tool_scratchie/web/WEB-INF/tags/Notebook.tag	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -0,0 +1,108 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="instructions" required="true" rtexprvalue="true"%>
+<%@ attribute name="formActionUrl" required="true" rtexprvalue="true"%>
+<%@ attribute name="formModelAttribute" required="false" rtexprvalue="true"%>
+<c:if test="${empty formModelAttribute}">
+	<c:set var="formModelAttribute" value="reflectionForm" />
+</c:if>
+<%@ attribute name="isNextActivityButtonSupported" required="true" rtexprvalue="true"%>
+<%@ attribute name="isLastActivity" required="false" rtexprvalue="true"%>
+<%@ attribute name="hiddenInputs" required="false" rtexprvalue="true"%>
+<c:if test="${empty hiddenInputs}">
+	<c:set var="hiddenInputs" value="userID,sessionMapID" />
+</c:if>
+<%@ attribute name="isNbTool" required="false" rtexprvalue="true"%>
+<c:if test="${empty isNbTool}">
+	<c:set var="isNbTool" value="false" />
+</c:if>
+
+<%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
+<%-- Default value for I18N keys --%> 
+<c:if test="${empty notebookLabelKey}">
+	<c:set var="notebookLabelKey" value="label.notebook" />
+</c:if>
+<c:if test="${empty finishButtonLabelKey}">
+	<c:set var="finishButtonLabelKey" value="label.submit" />
+</c:if>
+<c:if test="${empty nextActivityButtonLabelKey}">
+	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+</c:if>
+
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
+		}
+		function submitForm() {
+			var f = document.getElementById('reflectionForm');
+			f.submit();
+		}
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+	
+	<div id="instructions" class="instructions">
+		<lams:out value="${instructions}" escapeHtml="true" />
+	</div>
+	<hr class="mx-5">
+
+	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
+			<form:hidden path="${hiddenInput}" />
+		</c:forTokens>	
+			
+		<lams:errors5/>
+		
+		<div class="container-lg">
+			<div class="card lcard lcard-no-borders shadow mb-3">
+				<div class="card-header lcard-header-button-border">
+					<fmt:message key="${notebookLabelKey}" />
+				</div>
+				<div class="card-body mb-3">
+					<fmt:message key="${notebookLabelKey}" var="notebookLabel"/>
+					<form:textarea aria-label="${notebookLabel}" aria-multiline="true"
+						aria-required="true" required="true" path="entryText"
+						cssClass="form-control" id="focused" rows="5"></form:textarea>
+				</div>
+			</div>
+	
+			<div class="activity-bottom-buttons">
+				<button name="finishButton" id="finishButton" class="btn btn-primary">
+					<c:choose>
+						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
+							<fmt:message key="${finishButtonLabelKey}" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="${nextActivityButtonLabelKey}" />
+						</c:otherwise>
+					</c:choose>
+				</buttun>
+			</div>
+		
+		</div>
+	</form:form>
+	
+	<c:if test="${isNbTool}">
+		<!-- 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="${toolSessionID}"
+						   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
+						   pageSize="10" sortBy="1" />
+		</c:if>
+		<!-- End comments -->
+	</c:if>
+
+</lams:PageLearner>
\ No newline at end of file
Index: lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r14a43ff0db3bd18db9a56dde9555420f04347c47 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
+++ lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -16,161 +16,123 @@
    </listener>
 
    <tag>
-
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
       <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
       <name>WebAppURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
       </icon>
       <name>help</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Help tag</description>
          <name>module</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>toolSignature</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>page</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>style</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
       </icon>
       <name>Configuration</name>
       <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Get the configuration value for the specified key</description>
          <name>key</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
       <name>LAMSURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
       </icon>
       <name>html</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
          <description>Render html tag with direction and language</description>
          <name>xhtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
       <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
       <name>out</name>
       <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>value</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>escapeHtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts role name into form usable as message resources key</description>
       <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
       <name>role</name>
       <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts role name into form usable as message resources key</description>
          <name>role</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -192,7 +154,6 @@
  	  </attribute>
    </tag>
    <tag>
-
       <description>Output details from the shared session UserDTO object</description>
       <display-name>user details</display-name>
       <icon>    
@@ -205,14 +166,9 @@
          <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
-
-	
 	<tag>
       <description>Small portrait of a user</description>
       <display-name>User Portrait</display-name>
@@ -243,32 +199,61 @@
          <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
       </attribute>
    </tag>
-	
-	<tag-file>
-       <name>Tab</name>
-       <path>/WEB-INF/tags/Tab.tag</path>
-   	</tag-file>
+   <tag>
+	    <name>textarea</name>
+	    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
+	    <body-content>JSP</body-content>
+	    <dynamic-attributes>true</dynamic-attributes>
+	    <description>
+	    	Render text exactly same as  original input, which even won't escape the input HTML tag.
+	    </description>    
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>name</name>
+	        <required>true</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>id</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>onchange</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>disabled</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+  	</tag>
+  	
    	<tag-file>
-       <name>Tabs</name>
-       <path>/WEB-INF/tags/Tabs.tag</path>
-   	</tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+   	</tag-file> 
    	<tag-file>
-       <name>TabBody</name>
-       <path>/WEB-INF/tags/TabBody.tag</path>
-   	</tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
    	<tag-file>
-       <name>TabBodys</name>
-       <path>/WEB-INF/tags/TabBodys.tag</path>
+	    <name>Alert5</name>
+		<path>/WEB-INF/tags/Alert5.tag</path>
+   	</tag-file> 
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>TabBodyArea</name>
-       <path>/WEB-INF/tags/TabBodyArea.tag</path>
-   	</tag-file>
-   	<tag-file>
-       <name>CKEditor</name>
-       <path>/WEB-INF/tags/CKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   
@@ -281,86 +266,82 @@
        <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Rating</name>
-       <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>    		
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>StyledRating</name>
-       <path>/WEB-INF/tags/StyledRating.tag</path>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>headItems</name>
-       <path>/WEB-INF/tags/headItems.tag</path>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
-   	</tag-file>  
+   	</tag-file> 
    	<tag-file>
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Alert</name>
-		<path>/WEB-INF/tags/Alert.tag</path>
-   	</tag-file>  
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Page</name>
-		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>
+	    <name>errors</name>
+		<path>/WEB-INF/tags/Errors.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>TSTable</name>
-		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>    
-  	<tag-file>
-	    <name>Arrow</name>
-		<path>/WEB-INF/tags/Arrow.tag</path>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>AdvancedAccordian</name>
-       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
-   	</tag-file>  
-   	<tag-file>
-   		<name>RestrictedUsageAccordian</name>
-   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
    	</tag-file>
-  	<tag-file>
-	    <name>SimplePanel</name>
-		<path>/WEB-INF/tags/SimplePanel.tag</path>
-   	</tag-file>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>
    	<tag-file>
+       <name>headItems</name>
+       <path>/WEB-INF/tags/headItems.tag</path>
+   	</tag-file> 
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TextSearch</name>
-		<path>/WEB-INF/tags/TextSearch.tag</path>
-   	</tag-file>  
+       <name>Input</name>
+       <path>/WEB-INF/tags/Input.tag</path>
+   	</tag-file>
    	<tag-file>
+       <name>JSImport</name>
+       <path>/WEB-INF/tags/JSImport.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Notebook</name>
+		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file> 
    	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag-file>
-       <name>Etherpad</name>
-       <path>/WEB-INF/tags/Etherpad.tag</path>
-   	</tag-file> 
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
    	<tag-file>
-	    <name>errors</name>
-		<path>/WEB-INF/tags/Errors.tag</path>
-   	</tag-file> 
-   	<tag-file>
-	    <name>errors5</name>
-		<path>/WEB-INF/tags/Errors5.tag</path>
-   	</tag-file>    
-   	<tag-file>
-	    <name>Widget</name>
-		<path>/WEB-INF/tags/Widget.tag</path>
-   	</tag-file>   
-   	<tag-file>
 	    <name>Page5</name>
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
@@ -369,92 +350,71 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TSTable5</name>
-		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>  
+       <name>Popover</name>
+       <path>/WEB-INF/tags/Popover.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>WaitForLeader</name>
-		<path>/WEB-INF/tags/WaitForLeader.tag</path>
-   	</tag-file>  
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Alert5</name>
-		<path>/WEB-INF/tags/Alert5.tag</path>
-   	</tag-file>  
-   	<tag-file>
-       <name>FileUpload5</name>
-       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
-   	<tag>
-    <name>textarea</name>
-    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
-    <body-content>JSP</body-content>
-    <dynamic-attributes>true</dynamic-attributes>
-    <description>
-    	Render text exactly same as  original input, which even won't escape the input HTML tag.
-    </description>    
-    <attribute>
-        <description>
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>id</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>onchange</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>disabled</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-	<tag-file>
-		<name>head</name>
-	    <path>/WEB-INF/tags/Head.tag</path>
-	</tag-file>
-   	<tag-file>
-       <name>Comments</name>
-       <path>/WEB-INF/tags/Comments.tag</path>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>CommentsAuthor</name>
-       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
+   	</tag-file>    		
+   	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FileUpload</name>
-       <path>/WEB-INF/tags/FileUpload.tag</path>
+       <name>Switch</name>
+       <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>WaitingSpinner</name>
-       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>JSImport</name>
-       <path>/WEB-INF/tags/JSImport.tag</path>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Popover</name>
-       <path>/WEB-INF/tags/Popover.tag</path>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Input</name>
-       <path>/WEB-INF/tags/Input.tag</path>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Switch</name>
-       <path>/WEB-INF/tags/Switch.tag</path>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>TSTable5</name>
+		<path>/WEB-INF/tags/TSTable5.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
    	</tag-file>
+	<tag-file>
+	    <name>Widget</name>
+		<path>/WEB-INF/tags/Widget.tag</path>
+   	</tag-file> 
 </taglib>
\ No newline at end of file
Index: lams_tool_scratchie/web/pages/learning/notebook.jsp
===================================================================
diff -u -rd5fa41792bdb2657d0d53c35126a64604510d18a -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_tool_scratchie/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision d5fa41792bdb2657d0d53c35126a64604510d18a)
+++ lams_tool_scratchie/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -1,59 +1,10 @@
-<%@ include file="/common/taglibs.jsp"%>
 <!DOCTYPE html>
-
-
-<c:set var="sessionMapID" value="${param.sessionMapID}" />
+<%@ include file="/common/taglibs.jsp"%>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
-	
-<lams:html>
-<lams:head>
-	<title><fmt:message key="label.learning.title" /></title>
-	<%@ include file="/common/header.jsp"%>
-	<lams:JSImport src="learning/includes/javascript/gate-check.js" />
-	
-	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${sessionMap.toolSessionID}', '', submitForm);
-		
-		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
-		}
-		function submitForm() {
-			var f = document.getElementById('reflectionForm');
-			f.submit();
-		}
-	</script>
-</lams:head>
-<body class="stripes">
 
-	<form:form action="/lams/tool/lascrt11/learning/submitReflection.do" modelAttribute="reflectionForm" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
-		<form:hidden path="userID" />
-		<form:hidden path="sessionMapID" />
-
-		<lams:Page type="learner" title="${sessionMap.title}">
-
-			<lams:errors/>
-
-			<div class="panel">
-				<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true" />
-			</div>
-
-			<form:textarea rows="8" path="entryText" id="focused" cssClass="form-control" />
-
-			<div class="voffset10 pull-right">
-				<button name="finishButton" id="finishButton"
-					class="btn btn-sm btn-default">
-					<fmt:message key="label.submit" />
-				</buttun>
-			</div>
-
-			<div id="footer"></div>
-		</lams:Page>
-	</form:form>
-	<script type="text/javascript">
-		window.onload = function() {
-			document.getElementById("focused").focus();
-		}
-	</script>
-
-</body>
-</lams:html>
+<lams:Notebook title="${sessionMap.title}"
+	toolSessionID="${sessionMap.toolSessionID}"
+	instructions="${sessionMap.reflectInstructions}"
+	formActionUrl="/lams/tool/lascrt11/learning/submitReflection.do"
+	isNextActivityButtonSupported="false"
+	finishButtonLabelKey="label.button.submit"/>
Index: lams_tool_scribe/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u
--- lams_tool_scribe/web/WEB-INF/tags/Notebook.tag	(revision 0)
+++ lams_tool_scribe/web/WEB-INF/tags/Notebook.tag	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -0,0 +1,108 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="instructions" required="true" rtexprvalue="true"%>
+<%@ attribute name="formActionUrl" required="true" rtexprvalue="true"%>
+<%@ attribute name="formModelAttribute" required="false" rtexprvalue="true"%>
+<c:if test="${empty formModelAttribute}">
+	<c:set var="formModelAttribute" value="reflectionForm" />
+</c:if>
+<%@ attribute name="isNextActivityButtonSupported" required="true" rtexprvalue="true"%>
+<%@ attribute name="isLastActivity" required="false" rtexprvalue="true"%>
+<%@ attribute name="hiddenInputs" required="false" rtexprvalue="true"%>
+<c:if test="${empty hiddenInputs}">
+	<c:set var="hiddenInputs" value="userID,sessionMapID" />
+</c:if>
+<%@ attribute name="isNbTool" required="false" rtexprvalue="true"%>
+<c:if test="${empty isNbTool}">
+	<c:set var="isNbTool" value="false" />
+</c:if>
+
+<%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
+<%-- Default value for I18N keys --%> 
+<c:if test="${empty notebookLabelKey}">
+	<c:set var="notebookLabelKey" value="label.notebook" />
+</c:if>
+<c:if test="${empty finishButtonLabelKey}">
+	<c:set var="finishButtonLabelKey" value="label.submit" />
+</c:if>
+<c:if test="${empty nextActivityButtonLabelKey}">
+	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+</c:if>
+
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
+		}
+		function submitForm() {
+			var f = document.getElementById('reflectionForm');
+			f.submit();
+		}
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+	
+	<div id="instructions" class="instructions">
+		<lams:out value="${instructions}" escapeHtml="true" />
+	</div>
+	<hr class="mx-5">
+
+	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
+			<form:hidden path="${hiddenInput}" />
+		</c:forTokens>	
+			
+		<lams:errors5/>
+		
+		<div class="container-lg">
+			<div class="card lcard lcard-no-borders shadow mb-3">
+				<div class="card-header lcard-header-button-border">
+					<fmt:message key="${notebookLabelKey}" />
+				</div>
+				<div class="card-body mb-3">
+					<fmt:message key="${notebookLabelKey}" var="notebookLabel"/>
+					<form:textarea aria-label="${notebookLabel}" aria-multiline="true"
+						aria-required="true" required="true" path="entryText"
+						cssClass="form-control" id="focused" rows="5"></form:textarea>
+				</div>
+			</div>
+	
+			<div class="activity-bottom-buttons">
+				<button name="finishButton" id="finishButton" class="btn btn-primary">
+					<c:choose>
+						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
+							<fmt:message key="${finishButtonLabelKey}" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="${nextActivityButtonLabelKey}" />
+						</c:otherwise>
+					</c:choose>
+				</buttun>
+			</div>
+		
+		</div>
+	</form:form>
+	
+	<c:if test="${isNbTool}">
+		<!-- 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="${toolSessionID}"
+						   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
+						   pageSize="10" sortBy="1" />
+		</c:if>
+		<!-- End comments -->
+	</c:if>
+
+</lams:PageLearner>
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r14a43ff0db3bd18db9a56dde9555420f04347c47 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
+++ lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -16,161 +16,123 @@
    </listener>
 
    <tag>
-
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
       <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
       <name>WebAppURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
       </icon>
       <name>help</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Help tag</description>
          <name>module</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>toolSignature</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>page</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>style</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
       </icon>
       <name>Configuration</name>
       <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Get the configuration value for the specified key</description>
          <name>key</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
       <name>LAMSURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
       </icon>
       <name>html</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
          <description>Render html tag with direction and language</description>
          <name>xhtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
       <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
       <name>out</name>
       <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>value</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>escapeHtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts role name into form usable as message resources key</description>
       <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
       <name>role</name>
       <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts role name into form usable as message resources key</description>
          <name>role</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -192,7 +154,6 @@
  	  </attribute>
    </tag>
    <tag>
-
       <description>Output details from the shared session UserDTO object</description>
       <display-name>user details</display-name>
       <icon>    
@@ -205,14 +166,9 @@
          <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
-
-	
 	<tag>
       <description>Small portrait of a user</description>
       <display-name>User Portrait</display-name>
@@ -243,32 +199,61 @@
          <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
       </attribute>
    </tag>
-	
-	<tag-file>
-       <name>Tab</name>
-       <path>/WEB-INF/tags/Tab.tag</path>
-   	</tag-file>
+   <tag>
+	    <name>textarea</name>
+	    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
+	    <body-content>JSP</body-content>
+	    <dynamic-attributes>true</dynamic-attributes>
+	    <description>
+	    	Render text exactly same as  original input, which even won't escape the input HTML tag.
+	    </description>    
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>name</name>
+	        <required>true</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>id</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>onchange</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>disabled</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+  	</tag>
+  	
    	<tag-file>
-       <name>Tabs</name>
-       <path>/WEB-INF/tags/Tabs.tag</path>
-   	</tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+   	</tag-file> 
    	<tag-file>
-       <name>TabBody</name>
-       <path>/WEB-INF/tags/TabBody.tag</path>
-   	</tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
    	<tag-file>
-       <name>TabBodys</name>
-       <path>/WEB-INF/tags/TabBodys.tag</path>
+	    <name>Alert5</name>
+		<path>/WEB-INF/tags/Alert5.tag</path>
+   	</tag-file> 
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>TabBodyArea</name>
-       <path>/WEB-INF/tags/TabBodyArea.tag</path>
-   	</tag-file>
-   	<tag-file>
-       <name>CKEditor</name>
-       <path>/WEB-INF/tags/CKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   
@@ -281,86 +266,82 @@
        <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Rating</name>
-       <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>    		
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>StyledRating</name>
-       <path>/WEB-INF/tags/StyledRating.tag</path>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>headItems</name>
-       <path>/WEB-INF/tags/headItems.tag</path>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
-   	</tag-file>  
+   	</tag-file> 
    	<tag-file>
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Alert</name>
-		<path>/WEB-INF/tags/Alert.tag</path>
-   	</tag-file>  
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Page</name>
-		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>
+	    <name>errors</name>
+		<path>/WEB-INF/tags/Errors.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>TSTable</name>
-		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>    
-  	<tag-file>
-	    <name>Arrow</name>
-		<path>/WEB-INF/tags/Arrow.tag</path>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>AdvancedAccordian</name>
-       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
-   	</tag-file>  
-   	<tag-file>
-   		<name>RestrictedUsageAccordian</name>
-   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
    	</tag-file>
-  	<tag-file>
-	    <name>SimplePanel</name>
-		<path>/WEB-INF/tags/SimplePanel.tag</path>
-   	</tag-file>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>
    	<tag-file>
+       <name>headItems</name>
+       <path>/WEB-INF/tags/headItems.tag</path>
+   	</tag-file> 
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TextSearch</name>
-		<path>/WEB-INF/tags/TextSearch.tag</path>
-   	</tag-file>  
+       <name>Input</name>
+       <path>/WEB-INF/tags/Input.tag</path>
+   	</tag-file>
    	<tag-file>
+       <name>JSImport</name>
+       <path>/WEB-INF/tags/JSImport.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Notebook</name>
+		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file> 
    	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag-file>
-       <name>Etherpad</name>
-       <path>/WEB-INF/tags/Etherpad.tag</path>
-   	</tag-file> 
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
    	<tag-file>
-	    <name>errors</name>
-		<path>/WEB-INF/tags/Errors.tag</path>
-   	</tag-file> 
-   	<tag-file>
-	    <name>errors5</name>
-		<path>/WEB-INF/tags/Errors5.tag</path>
-   	</tag-file>    
-   	<tag-file>
-	    <name>Widget</name>
-		<path>/WEB-INF/tags/Widget.tag</path>
-   	</tag-file>   
-   	<tag-file>
 	    <name>Page5</name>
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
@@ -369,92 +350,71 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TSTable5</name>
-		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>  
+       <name>Popover</name>
+       <path>/WEB-INF/tags/Popover.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>WaitForLeader</name>
-		<path>/WEB-INF/tags/WaitForLeader.tag</path>
-   	</tag-file>  
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Alert5</name>
-		<path>/WEB-INF/tags/Alert5.tag</path>
-   	</tag-file>  
-   	<tag-file>
-       <name>FileUpload5</name>
-       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
-   	<tag>
-    <name>textarea</name>
-    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
-    <body-content>JSP</body-content>
-    <dynamic-attributes>true</dynamic-attributes>
-    <description>
-    	Render text exactly same as  original input, which even won't escape the input HTML tag.
-    </description>    
-    <attribute>
-        <description>
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>id</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>onchange</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>disabled</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-	<tag-file>
-		<name>head</name>
-	    <path>/WEB-INF/tags/Head.tag</path>
-	</tag-file>
-   	<tag-file>
-       <name>Comments</name>
-       <path>/WEB-INF/tags/Comments.tag</path>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>CommentsAuthor</name>
-       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
+   	</tag-file>    		
+   	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FileUpload</name>
-       <path>/WEB-INF/tags/FileUpload.tag</path>
+       <name>Switch</name>
+       <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>WaitingSpinner</name>
-       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>JSImport</name>
-       <path>/WEB-INF/tags/JSImport.tag</path>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Popover</name>
-       <path>/WEB-INF/tags/Popover.tag</path>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Input</name>
-       <path>/WEB-INF/tags/Input.tag</path>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Switch</name>
-       <path>/WEB-INF/tags/Switch.tag</path>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>TSTable5</name>
+		<path>/WEB-INF/tags/TSTable5.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
    	</tag-file>
+	<tag-file>
+	    <name>Widget</name>
+		<path>/WEB-INF/tags/Widget.tag</path>
+   	</tag-file> 
 </taglib>
\ No newline at end of file
Index: lams_tool_spreadsheet/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u
--- lams_tool_spreadsheet/web/WEB-INF/tags/Notebook.tag	(revision 0)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Notebook.tag	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -0,0 +1,108 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="instructions" required="true" rtexprvalue="true"%>
+<%@ attribute name="formActionUrl" required="true" rtexprvalue="true"%>
+<%@ attribute name="formModelAttribute" required="false" rtexprvalue="true"%>
+<c:if test="${empty formModelAttribute}">
+	<c:set var="formModelAttribute" value="reflectionForm" />
+</c:if>
+<%@ attribute name="isNextActivityButtonSupported" required="true" rtexprvalue="true"%>
+<%@ attribute name="isLastActivity" required="false" rtexprvalue="true"%>
+<%@ attribute name="hiddenInputs" required="false" rtexprvalue="true"%>
+<c:if test="${empty hiddenInputs}">
+	<c:set var="hiddenInputs" value="userID,sessionMapID" />
+</c:if>
+<%@ attribute name="isNbTool" required="false" rtexprvalue="true"%>
+<c:if test="${empty isNbTool}">
+	<c:set var="isNbTool" value="false" />
+</c:if>
+
+<%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
+<%-- Default value for I18N keys --%> 
+<c:if test="${empty notebookLabelKey}">
+	<c:set var="notebookLabelKey" value="label.notebook" />
+</c:if>
+<c:if test="${empty finishButtonLabelKey}">
+	<c:set var="finishButtonLabelKey" value="label.submit" />
+</c:if>
+<c:if test="${empty nextActivityButtonLabelKey}">
+	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+</c:if>
+
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
+		}
+		function submitForm() {
+			var f = document.getElementById('reflectionForm');
+			f.submit();
+		}
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+	
+	<div id="instructions" class="instructions">
+		<lams:out value="${instructions}" escapeHtml="true" />
+	</div>
+	<hr class="mx-5">
+
+	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
+			<form:hidden path="${hiddenInput}" />
+		</c:forTokens>	
+			
+		<lams:errors5/>
+		
+		<div class="container-lg">
+			<div class="card lcard lcard-no-borders shadow mb-3">
+				<div class="card-header lcard-header-button-border">
+					<fmt:message key="${notebookLabelKey}" />
+				</div>
+				<div class="card-body mb-3">
+					<fmt:message key="${notebookLabelKey}" var="notebookLabel"/>
+					<form:textarea aria-label="${notebookLabel}" aria-multiline="true"
+						aria-required="true" required="true" path="entryText"
+						cssClass="form-control" id="focused" rows="5"></form:textarea>
+				</div>
+			</div>
+	
+			<div class="activity-bottom-buttons">
+				<button name="finishButton" id="finishButton" class="btn btn-primary">
+					<c:choose>
+						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
+							<fmt:message key="${finishButtonLabelKey}" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="${nextActivityButtonLabelKey}" />
+						</c:otherwise>
+					</c:choose>
+				</buttun>
+			</div>
+		
+		</div>
+	</form:form>
+	
+	<c:if test="${isNbTool}">
+		<!-- 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="${toolSessionID}"
+						   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
+						   pageSize="10" sortBy="1" />
+		</c:if>
+		<!-- End comments -->
+	</c:if>
+
+</lams:PageLearner>
\ No newline at end of file
Index: lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r14a43ff0db3bd18db9a56dde9555420f04347c47 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
+++ lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -16,161 +16,123 @@
    </listener>
 
    <tag>
-
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
       <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
       <name>WebAppURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
       </icon>
       <name>help</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Help tag</description>
          <name>module</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>toolSignature</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>page</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>style</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
       </icon>
       <name>Configuration</name>
       <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Get the configuration value for the specified key</description>
          <name>key</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
       <name>LAMSURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
       </icon>
       <name>html</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
          <description>Render html tag with direction and language</description>
          <name>xhtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
       <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
       <name>out</name>
       <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>value</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>escapeHtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts role name into form usable as message resources key</description>
       <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
       <name>role</name>
       <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts role name into form usable as message resources key</description>
          <name>role</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -192,7 +154,6 @@
  	  </attribute>
    </tag>
    <tag>
-
       <description>Output details from the shared session UserDTO object</description>
       <display-name>user details</display-name>
       <icon>    
@@ -205,14 +166,9 @@
          <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
-
-	
 	<tag>
       <description>Small portrait of a user</description>
       <display-name>User Portrait</display-name>
@@ -243,32 +199,61 @@
          <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
       </attribute>
    </tag>
-	
-	<tag-file>
-       <name>Tab</name>
-       <path>/WEB-INF/tags/Tab.tag</path>
-   	</tag-file>
+   <tag>
+	    <name>textarea</name>
+	    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
+	    <body-content>JSP</body-content>
+	    <dynamic-attributes>true</dynamic-attributes>
+	    <description>
+	    	Render text exactly same as  original input, which even won't escape the input HTML tag.
+	    </description>    
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>name</name>
+	        <required>true</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>id</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>onchange</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>disabled</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+  	</tag>
+  	
    	<tag-file>
-       <name>Tabs</name>
-       <path>/WEB-INF/tags/Tabs.tag</path>
-   	</tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+   	</tag-file> 
    	<tag-file>
-       <name>TabBody</name>
-       <path>/WEB-INF/tags/TabBody.tag</path>
-   	</tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
    	<tag-file>
-       <name>TabBodys</name>
-       <path>/WEB-INF/tags/TabBodys.tag</path>
+	    <name>Alert5</name>
+		<path>/WEB-INF/tags/Alert5.tag</path>
+   	</tag-file> 
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>TabBodyArea</name>
-       <path>/WEB-INF/tags/TabBodyArea.tag</path>
-   	</tag-file>
-   	<tag-file>
-       <name>CKEditor</name>
-       <path>/WEB-INF/tags/CKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   
@@ -281,86 +266,82 @@
        <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Rating</name>
-       <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>    		
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>StyledRating</name>
-       <path>/WEB-INF/tags/StyledRating.tag</path>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>headItems</name>
-       <path>/WEB-INF/tags/headItems.tag</path>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
-   	</tag-file>  
+   	</tag-file> 
    	<tag-file>
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Alert</name>
-		<path>/WEB-INF/tags/Alert.tag</path>
-   	</tag-file>  
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Page</name>
-		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>
+	    <name>errors</name>
+		<path>/WEB-INF/tags/Errors.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>TSTable</name>
-		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>    
-  	<tag-file>
-	    <name>Arrow</name>
-		<path>/WEB-INF/tags/Arrow.tag</path>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>AdvancedAccordian</name>
-       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
-   	</tag-file>  
-   	<tag-file>
-   		<name>RestrictedUsageAccordian</name>
-   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
    	</tag-file>
-  	<tag-file>
-	    <name>SimplePanel</name>
-		<path>/WEB-INF/tags/SimplePanel.tag</path>
-   	</tag-file>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>
    	<tag-file>
+       <name>headItems</name>
+       <path>/WEB-INF/tags/headItems.tag</path>
+   	</tag-file> 
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TextSearch</name>
-		<path>/WEB-INF/tags/TextSearch.tag</path>
-   	</tag-file>  
+       <name>Input</name>
+       <path>/WEB-INF/tags/Input.tag</path>
+   	</tag-file>
    	<tag-file>
+       <name>JSImport</name>
+       <path>/WEB-INF/tags/JSImport.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Notebook</name>
+		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file> 
    	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag-file>
-       <name>Etherpad</name>
-       <path>/WEB-INF/tags/Etherpad.tag</path>
-   	</tag-file> 
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
    	<tag-file>
-	    <name>errors</name>
-		<path>/WEB-INF/tags/Errors.tag</path>
-   	</tag-file> 
-   	<tag-file>
-	    <name>errors5</name>
-		<path>/WEB-INF/tags/Errors5.tag</path>
-   	</tag-file>    
-   	<tag-file>
-	    <name>Widget</name>
-		<path>/WEB-INF/tags/Widget.tag</path>
-   	</tag-file>   
-   	<tag-file>
 	    <name>Page5</name>
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
@@ -369,92 +350,71 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TSTable5</name>
-		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>  
+       <name>Popover</name>
+       <path>/WEB-INF/tags/Popover.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>WaitForLeader</name>
-		<path>/WEB-INF/tags/WaitForLeader.tag</path>
-   	</tag-file>  
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Alert5</name>
-		<path>/WEB-INF/tags/Alert5.tag</path>
-   	</tag-file>  
-   	<tag-file>
-       <name>FileUpload5</name>
-       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
-   	<tag>
-    <name>textarea</name>
-    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
-    <body-content>JSP</body-content>
-    <dynamic-attributes>true</dynamic-attributes>
-    <description>
-    	Render text exactly same as  original input, which even won't escape the input HTML tag.
-    </description>    
-    <attribute>
-        <description>
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>id</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>onchange</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>disabled</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-	<tag-file>
-		<name>head</name>
-	    <path>/WEB-INF/tags/Head.tag</path>
-	</tag-file>
-   	<tag-file>
-       <name>Comments</name>
-       <path>/WEB-INF/tags/Comments.tag</path>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>CommentsAuthor</name>
-       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
+   	</tag-file>    		
+   	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FileUpload</name>
-       <path>/WEB-INF/tags/FileUpload.tag</path>
+       <name>Switch</name>
+       <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>WaitingSpinner</name>
-       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>JSImport</name>
-       <path>/WEB-INF/tags/JSImport.tag</path>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Popover</name>
-       <path>/WEB-INF/tags/Popover.tag</path>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Input</name>
-       <path>/WEB-INF/tags/Input.tag</path>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Switch</name>
-       <path>/WEB-INF/tags/Switch.tag</path>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>TSTable5</name>
+		<path>/WEB-INF/tags/TSTable5.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
    	</tag-file>
+	<tag-file>
+	    <name>Widget</name>
+		<path>/WEB-INF/tags/Widget.tag</path>
+   	</tag-file> 
 </taglib>
\ No newline at end of file
Index: lams_tool_survey/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u
--- lams_tool_survey/web/WEB-INF/tags/Notebook.tag	(revision 0)
+++ lams_tool_survey/web/WEB-INF/tags/Notebook.tag	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -0,0 +1,108 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="instructions" required="true" rtexprvalue="true"%>
+<%@ attribute name="formActionUrl" required="true" rtexprvalue="true"%>
+<%@ attribute name="formModelAttribute" required="false" rtexprvalue="true"%>
+<c:if test="${empty formModelAttribute}">
+	<c:set var="formModelAttribute" value="reflectionForm" />
+</c:if>
+<%@ attribute name="isNextActivityButtonSupported" required="true" rtexprvalue="true"%>
+<%@ attribute name="isLastActivity" required="false" rtexprvalue="true"%>
+<%@ attribute name="hiddenInputs" required="false" rtexprvalue="true"%>
+<c:if test="${empty hiddenInputs}">
+	<c:set var="hiddenInputs" value="userID,sessionMapID" />
+</c:if>
+<%@ attribute name="isNbTool" required="false" rtexprvalue="true"%>
+<c:if test="${empty isNbTool}">
+	<c:set var="isNbTool" value="false" />
+</c:if>
+
+<%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
+<%-- Default value for I18N keys --%> 
+<c:if test="${empty notebookLabelKey}">
+	<c:set var="notebookLabelKey" value="label.notebook" />
+</c:if>
+<c:if test="${empty finishButtonLabelKey}">
+	<c:set var="finishButtonLabelKey" value="label.submit" />
+</c:if>
+<c:if test="${empty nextActivityButtonLabelKey}">
+	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+</c:if>
+
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
+		}
+		function submitForm() {
+			var f = document.getElementById('reflectionForm');
+			f.submit();
+		}
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+	
+	<div id="instructions" class="instructions">
+		<lams:out value="${instructions}" escapeHtml="true" />
+	</div>
+	<hr class="mx-5">
+
+	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
+			<form:hidden path="${hiddenInput}" />
+		</c:forTokens>	
+			
+		<lams:errors5/>
+		
+		<div class="container-lg">
+			<div class="card lcard lcard-no-borders shadow mb-3">
+				<div class="card-header lcard-header-button-border">
+					<fmt:message key="${notebookLabelKey}" />
+				</div>
+				<div class="card-body mb-3">
+					<fmt:message key="${notebookLabelKey}" var="notebookLabel"/>
+					<form:textarea aria-label="${notebookLabel}" aria-multiline="true"
+						aria-required="true" required="true" path="entryText"
+						cssClass="form-control" id="focused" rows="5"></form:textarea>
+				</div>
+			</div>
+	
+			<div class="activity-bottom-buttons">
+				<button name="finishButton" id="finishButton" class="btn btn-primary">
+					<c:choose>
+						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
+							<fmt:message key="${finishButtonLabelKey}" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="${nextActivityButtonLabelKey}" />
+						</c:otherwise>
+					</c:choose>
+				</buttun>
+			</div>
+		
+		</div>
+	</form:form>
+	
+	<c:if test="${isNbTool}">
+		<!-- 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="${toolSessionID}"
+						   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
+						   pageSize="10" sortBy="1" />
+		</c:if>
+		<!-- End comments -->
+	</c:if>
+
+</lams:PageLearner>
\ No newline at end of file
Index: lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r14a43ff0db3bd18db9a56dde9555420f04347c47 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
+++ lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -16,161 +16,123 @@
    </listener>
 
    <tag>
-
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
       <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
       <name>WebAppURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
       </icon>
       <name>help</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Help tag</description>
          <name>module</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>toolSignature</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>page</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>style</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
       </icon>
       <name>Configuration</name>
       <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Get the configuration value for the specified key</description>
          <name>key</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
       <name>LAMSURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
       </icon>
       <name>html</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
          <description>Render html tag with direction and language</description>
          <name>xhtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
       <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
       <name>out</name>
       <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>value</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>escapeHtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts role name into form usable as message resources key</description>
       <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
       <name>role</name>
       <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts role name into form usable as message resources key</description>
          <name>role</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -192,7 +154,6 @@
  	  </attribute>
    </tag>
    <tag>
-
       <description>Output details from the shared session UserDTO object</description>
       <display-name>user details</display-name>
       <icon>    
@@ -205,14 +166,9 @@
          <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
-
-	
 	<tag>
       <description>Small portrait of a user</description>
       <display-name>User Portrait</display-name>
@@ -243,32 +199,61 @@
          <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
       </attribute>
    </tag>
-	
-	<tag-file>
-       <name>Tab</name>
-       <path>/WEB-INF/tags/Tab.tag</path>
-   	</tag-file>
+   <tag>
+	    <name>textarea</name>
+	    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
+	    <body-content>JSP</body-content>
+	    <dynamic-attributes>true</dynamic-attributes>
+	    <description>
+	    	Render text exactly same as  original input, which even won't escape the input HTML tag.
+	    </description>    
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>name</name>
+	        <required>true</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>id</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>onchange</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>disabled</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+  	</tag>
+  	
    	<tag-file>
-       <name>Tabs</name>
-       <path>/WEB-INF/tags/Tabs.tag</path>
-   	</tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+   	</tag-file> 
    	<tag-file>
-       <name>TabBody</name>
-       <path>/WEB-INF/tags/TabBody.tag</path>
-   	</tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
    	<tag-file>
-       <name>TabBodys</name>
-       <path>/WEB-INF/tags/TabBodys.tag</path>
+	    <name>Alert5</name>
+		<path>/WEB-INF/tags/Alert5.tag</path>
+   	</tag-file> 
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>TabBodyArea</name>
-       <path>/WEB-INF/tags/TabBodyArea.tag</path>
-   	</tag-file>
-   	<tag-file>
-       <name>CKEditor</name>
-       <path>/WEB-INF/tags/CKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   
@@ -281,86 +266,82 @@
        <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Rating</name>
-       <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>    		
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>StyledRating</name>
-       <path>/WEB-INF/tags/StyledRating.tag</path>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>headItems</name>
-       <path>/WEB-INF/tags/headItems.tag</path>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
-   	</tag-file>  
+   	</tag-file> 
    	<tag-file>
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Alert</name>
-		<path>/WEB-INF/tags/Alert.tag</path>
-   	</tag-file>  
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Page</name>
-		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>
+	    <name>errors</name>
+		<path>/WEB-INF/tags/Errors.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>TSTable</name>
-		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>    
-  	<tag-file>
-	    <name>Arrow</name>
-		<path>/WEB-INF/tags/Arrow.tag</path>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>AdvancedAccordian</name>
-       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
-   	</tag-file>  
-   	<tag-file>
-   		<name>RestrictedUsageAccordian</name>
-   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
    	</tag-file>
-  	<tag-file>
-	    <name>SimplePanel</name>
-		<path>/WEB-INF/tags/SimplePanel.tag</path>
-   	</tag-file>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>
    	<tag-file>
+       <name>headItems</name>
+       <path>/WEB-INF/tags/headItems.tag</path>
+   	</tag-file> 
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TextSearch</name>
-		<path>/WEB-INF/tags/TextSearch.tag</path>
-   	</tag-file>  
+       <name>Input</name>
+       <path>/WEB-INF/tags/Input.tag</path>
+   	</tag-file>
    	<tag-file>
+       <name>JSImport</name>
+       <path>/WEB-INF/tags/JSImport.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Notebook</name>
+		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file> 
    	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag-file>
-       <name>Etherpad</name>
-       <path>/WEB-INF/tags/Etherpad.tag</path>
-   	</tag-file> 
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
    	<tag-file>
-	    <name>errors</name>
-		<path>/WEB-INF/tags/Errors.tag</path>
-   	</tag-file> 
-   	<tag-file>
-	    <name>errors5</name>
-		<path>/WEB-INF/tags/Errors5.tag</path>
-   	</tag-file>    
-   	<tag-file>
-	    <name>Widget</name>
-		<path>/WEB-INF/tags/Widget.tag</path>
-   	</tag-file>   
-   	<tag-file>
 	    <name>Page5</name>
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
@@ -369,92 +350,71 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TSTable5</name>
-		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>  
+       <name>Popover</name>
+       <path>/WEB-INF/tags/Popover.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>WaitForLeader</name>
-		<path>/WEB-INF/tags/WaitForLeader.tag</path>
-   	</tag-file>  
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Alert5</name>
-		<path>/WEB-INF/tags/Alert5.tag</path>
-   	</tag-file>  
-   	<tag-file>
-       <name>FileUpload5</name>
-       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
-   	<tag>
-    <name>textarea</name>
-    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
-    <body-content>JSP</body-content>
-    <dynamic-attributes>true</dynamic-attributes>
-    <description>
-    	Render text exactly same as  original input, which even won't escape the input HTML tag.
-    </description>    
-    <attribute>
-        <description>
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>id</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>onchange</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>disabled</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-	<tag-file>
-		<name>head</name>
-	    <path>/WEB-INF/tags/Head.tag</path>
-	</tag-file>
-   	<tag-file>
-       <name>Comments</name>
-       <path>/WEB-INF/tags/Comments.tag</path>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>CommentsAuthor</name>
-       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
+   	</tag-file>    		
+   	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FileUpload</name>
-       <path>/WEB-INF/tags/FileUpload.tag</path>
+       <name>Switch</name>
+       <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>WaitingSpinner</name>
-       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>JSImport</name>
-       <path>/WEB-INF/tags/JSImport.tag</path>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Popover</name>
-       <path>/WEB-INF/tags/Popover.tag</path>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Input</name>
-       <path>/WEB-INF/tags/Input.tag</path>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Switch</name>
-       <path>/WEB-INF/tags/Switch.tag</path>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>TSTable5</name>
+		<path>/WEB-INF/tags/TSTable5.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
    	</tag-file>
+	<tag-file>
+	    <name>Widget</name>
+		<path>/WEB-INF/tags/Widget.tag</path>
+   	</tag-file> 
 </taglib>
\ No newline at end of file
Index: lams_tool_task/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u
--- lams_tool_task/web/WEB-INF/tags/Notebook.tag	(revision 0)
+++ lams_tool_task/web/WEB-INF/tags/Notebook.tag	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -0,0 +1,108 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="instructions" required="true" rtexprvalue="true"%>
+<%@ attribute name="formActionUrl" required="true" rtexprvalue="true"%>
+<%@ attribute name="formModelAttribute" required="false" rtexprvalue="true"%>
+<c:if test="${empty formModelAttribute}">
+	<c:set var="formModelAttribute" value="reflectionForm" />
+</c:if>
+<%@ attribute name="isNextActivityButtonSupported" required="true" rtexprvalue="true"%>
+<%@ attribute name="isLastActivity" required="false" rtexprvalue="true"%>
+<%@ attribute name="hiddenInputs" required="false" rtexprvalue="true"%>
+<c:if test="${empty hiddenInputs}">
+	<c:set var="hiddenInputs" value="userID,sessionMapID" />
+</c:if>
+<%@ attribute name="isNbTool" required="false" rtexprvalue="true"%>
+<c:if test="${empty isNbTool}">
+	<c:set var="isNbTool" value="false" />
+</c:if>
+
+<%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
+<%-- Default value for I18N keys --%> 
+<c:if test="${empty notebookLabelKey}">
+	<c:set var="notebookLabelKey" value="label.notebook" />
+</c:if>
+<c:if test="${empty finishButtonLabelKey}">
+	<c:set var="finishButtonLabelKey" value="label.submit" />
+</c:if>
+<c:if test="${empty nextActivityButtonLabelKey}">
+	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+</c:if>
+
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
+		}
+		function submitForm() {
+			var f = document.getElementById('reflectionForm');
+			f.submit();
+		}
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+	
+	<div id="instructions" class="instructions">
+		<lams:out value="${instructions}" escapeHtml="true" />
+	</div>
+	<hr class="mx-5">
+
+	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
+			<form:hidden path="${hiddenInput}" />
+		</c:forTokens>	
+			
+		<lams:errors5/>
+		
+		<div class="container-lg">
+			<div class="card lcard lcard-no-borders shadow mb-3">
+				<div class="card-header lcard-header-button-border">
+					<fmt:message key="${notebookLabelKey}" />
+				</div>
+				<div class="card-body mb-3">
+					<fmt:message key="${notebookLabelKey}" var="notebookLabel"/>
+					<form:textarea aria-label="${notebookLabel}" aria-multiline="true"
+						aria-required="true" required="true" path="entryText"
+						cssClass="form-control" id="focused" rows="5"></form:textarea>
+				</div>
+			</div>
+	
+			<div class="activity-bottom-buttons">
+				<button name="finishButton" id="finishButton" class="btn btn-primary">
+					<c:choose>
+						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
+							<fmt:message key="${finishButtonLabelKey}" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="${nextActivityButtonLabelKey}" />
+						</c:otherwise>
+					</c:choose>
+				</buttun>
+			</div>
+		
+		</div>
+	</form:form>
+	
+	<c:if test="${isNbTool}">
+		<!-- 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="${toolSessionID}"
+						   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
+						   pageSize="10" sortBy="1" />
+		</c:if>
+		<!-- End comments -->
+	</c:if>
+
+</lams:PageLearner>
\ No newline at end of file
Index: lams_tool_task/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r14a43ff0db3bd18db9a56dde9555420f04347c47 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_tool_task/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
+++ lams_tool_task/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -16,161 +16,123 @@
    </listener>
 
    <tag>
-
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
       <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
       <name>WebAppURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
       </icon>
       <name>help</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Help tag</description>
          <name>module</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>toolSignature</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>page</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>style</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
       </icon>
       <name>Configuration</name>
       <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Get the configuration value for the specified key</description>
          <name>key</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
       <name>LAMSURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
       </icon>
       <name>html</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
          <description>Render html tag with direction and language</description>
          <name>xhtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
       <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
       <name>out</name>
       <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>value</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>escapeHtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts role name into form usable as message resources key</description>
       <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
       <name>role</name>
       <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts role name into form usable as message resources key</description>
          <name>role</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -192,7 +154,6 @@
  	  </attribute>
    </tag>
    <tag>
-
       <description>Output details from the shared session UserDTO object</description>
       <display-name>user details</display-name>
       <icon>    
@@ -205,14 +166,9 @@
          <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
-
-	
 	<tag>
       <description>Small portrait of a user</description>
       <display-name>User Portrait</display-name>
@@ -243,32 +199,61 @@
          <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
       </attribute>
    </tag>
-	
-	<tag-file>
-       <name>Tab</name>
-       <path>/WEB-INF/tags/Tab.tag</path>
-   	</tag-file>
+   <tag>
+	    <name>textarea</name>
+	    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
+	    <body-content>JSP</body-content>
+	    <dynamic-attributes>true</dynamic-attributes>
+	    <description>
+	    	Render text exactly same as  original input, which even won't escape the input HTML tag.
+	    </description>    
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>name</name>
+	        <required>true</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>id</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>onchange</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>disabled</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+  	</tag>
+  	
    	<tag-file>
-       <name>Tabs</name>
-       <path>/WEB-INF/tags/Tabs.tag</path>
-   	</tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+   	</tag-file> 
    	<tag-file>
-       <name>TabBody</name>
-       <path>/WEB-INF/tags/TabBody.tag</path>
-   	</tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
    	<tag-file>
-       <name>TabBodys</name>
-       <path>/WEB-INF/tags/TabBodys.tag</path>
+	    <name>Alert5</name>
+		<path>/WEB-INF/tags/Alert5.tag</path>
+   	</tag-file> 
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>TabBodyArea</name>
-       <path>/WEB-INF/tags/TabBodyArea.tag</path>
-   	</tag-file>
-   	<tag-file>
-       <name>CKEditor</name>
-       <path>/WEB-INF/tags/CKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   
@@ -281,86 +266,82 @@
        <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Rating</name>
-       <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>    		
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>StyledRating</name>
-       <path>/WEB-INF/tags/StyledRating.tag</path>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>headItems</name>
-       <path>/WEB-INF/tags/headItems.tag</path>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
-   	</tag-file>  
+   	</tag-file> 
    	<tag-file>
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Alert</name>
-		<path>/WEB-INF/tags/Alert.tag</path>
-   	</tag-file>  
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Page</name>
-		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>
+	    <name>errors</name>
+		<path>/WEB-INF/tags/Errors.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>TSTable</name>
-		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>    
-  	<tag-file>
-	    <name>Arrow</name>
-		<path>/WEB-INF/tags/Arrow.tag</path>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>AdvancedAccordian</name>
-       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
-   	</tag-file>  
-   	<tag-file>
-   		<name>RestrictedUsageAccordian</name>
-   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
    	</tag-file>
-  	<tag-file>
-	    <name>SimplePanel</name>
-		<path>/WEB-INF/tags/SimplePanel.tag</path>
-   	</tag-file>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>
    	<tag-file>
+       <name>headItems</name>
+       <path>/WEB-INF/tags/headItems.tag</path>
+   	</tag-file> 
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TextSearch</name>
-		<path>/WEB-INF/tags/TextSearch.tag</path>
-   	</tag-file>  
+       <name>Input</name>
+       <path>/WEB-INF/tags/Input.tag</path>
+   	</tag-file>
    	<tag-file>
+       <name>JSImport</name>
+       <path>/WEB-INF/tags/JSImport.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Notebook</name>
+		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file> 
    	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag-file>
-       <name>Etherpad</name>
-       <path>/WEB-INF/tags/Etherpad.tag</path>
-   	</tag-file> 
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
    	<tag-file>
-	    <name>errors</name>
-		<path>/WEB-INF/tags/Errors.tag</path>
-   	</tag-file> 
-   	<tag-file>
-	    <name>errors5</name>
-		<path>/WEB-INF/tags/Errors5.tag</path>
-   	</tag-file>    
-   	<tag-file>
-	    <name>Widget</name>
-		<path>/WEB-INF/tags/Widget.tag</path>
-   	</tag-file>   
-   	<tag-file>
 	    <name>Page5</name>
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
@@ -369,92 +350,71 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TSTable5</name>
-		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>  
+       <name>Popover</name>
+       <path>/WEB-INF/tags/Popover.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>WaitForLeader</name>
-		<path>/WEB-INF/tags/WaitForLeader.tag</path>
-   	</tag-file>  
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Alert5</name>
-		<path>/WEB-INF/tags/Alert5.tag</path>
-   	</tag-file>  
-   	<tag-file>
-       <name>FileUpload5</name>
-       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
-   	<tag>
-    <name>textarea</name>
-    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
-    <body-content>JSP</body-content>
-    <dynamic-attributes>true</dynamic-attributes>
-    <description>
-    	Render text exactly same as  original input, which even won't escape the input HTML tag.
-    </description>    
-    <attribute>
-        <description>
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>id</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>onchange</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>disabled</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-	<tag-file>
-		<name>head</name>
-	    <path>/WEB-INF/tags/Head.tag</path>
-	</tag-file>
-   	<tag-file>
-       <name>Comments</name>
-       <path>/WEB-INF/tags/Comments.tag</path>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>CommentsAuthor</name>
-       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
+   	</tag-file>    		
+   	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FileUpload</name>
-       <path>/WEB-INF/tags/FileUpload.tag</path>
+       <name>Switch</name>
+       <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>WaitingSpinner</name>
-       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>JSImport</name>
-       <path>/WEB-INF/tags/JSImport.tag</path>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Popover</name>
-       <path>/WEB-INF/tags/Popover.tag</path>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Input</name>
-       <path>/WEB-INF/tags/Input.tag</path>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Switch</name>
-       <path>/WEB-INF/tags/Switch.tag</path>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>TSTable5</name>
+		<path>/WEB-INF/tags/TSTable5.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
    	</tag-file>
+	<tag-file>
+	    <name>Widget</name>
+		<path>/WEB-INF/tags/Widget.tag</path>
+   	</tag-file> 
 </taglib>
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u
--- lams_tool_vote/web/WEB-INF/tags/Notebook.tag	(revision 0)
+++ lams_tool_vote/web/WEB-INF/tags/Notebook.tag	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -0,0 +1,108 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="instructions" required="true" rtexprvalue="true"%>
+<%@ attribute name="formActionUrl" required="true" rtexprvalue="true"%>
+<%@ attribute name="formModelAttribute" required="false" rtexprvalue="true"%>
+<c:if test="${empty formModelAttribute}">
+	<c:set var="formModelAttribute" value="reflectionForm" />
+</c:if>
+<%@ attribute name="isNextActivityButtonSupported" required="true" rtexprvalue="true"%>
+<%@ attribute name="isLastActivity" required="false" rtexprvalue="true"%>
+<%@ attribute name="hiddenInputs" required="false" rtexprvalue="true"%>
+<c:if test="${empty hiddenInputs}">
+	<c:set var="hiddenInputs" value="userID,sessionMapID" />
+</c:if>
+<%@ attribute name="isNbTool" required="false" rtexprvalue="true"%>
+<c:if test="${empty isNbTool}">
+	<c:set var="isNbTool" value="false" />
+</c:if>
+
+<%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
+<%-- Default value for I18N keys --%> 
+<c:if test="${empty notebookLabelKey}">
+	<c:set var="notebookLabelKey" value="label.notebook" />
+</c:if>
+<c:if test="${empty finishButtonLabelKey}">
+	<c:set var="finishButtonLabelKey" value="label.submit" />
+</c:if>
+<c:if test="${empty nextActivityButtonLabelKey}">
+	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+</c:if>
+
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
+		}
+		function submitForm() {
+			var f = document.getElementById('reflectionForm');
+			f.submit();
+		}
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+	
+	<div id="instructions" class="instructions">
+		<lams:out value="${instructions}" escapeHtml="true" />
+	</div>
+	<hr class="mx-5">
+
+	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
+			<form:hidden path="${hiddenInput}" />
+		</c:forTokens>	
+			
+		<lams:errors5/>
+		
+		<div class="container-lg">
+			<div class="card lcard lcard-no-borders shadow mb-3">
+				<div class="card-header lcard-header-button-border">
+					<fmt:message key="${notebookLabelKey}" />
+				</div>
+				<div class="card-body mb-3">
+					<fmt:message key="${notebookLabelKey}" var="notebookLabel"/>
+					<form:textarea aria-label="${notebookLabel}" aria-multiline="true"
+						aria-required="true" required="true" path="entryText"
+						cssClass="form-control" id="focused" rows="5"></form:textarea>
+				</div>
+			</div>
+	
+			<div class="activity-bottom-buttons">
+				<button name="finishButton" id="finishButton" class="btn btn-primary">
+					<c:choose>
+						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
+							<fmt:message key="${finishButtonLabelKey}" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="${nextActivityButtonLabelKey}" />
+						</c:otherwise>
+					</c:choose>
+				</buttun>
+			</div>
+		
+		</div>
+	</form:form>
+	
+	<c:if test="${isNbTool}">
+		<!-- 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="${toolSessionID}"
+						   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
+						   pageSize="10" sortBy="1" />
+		</c:if>
+		<!-- End comments -->
+	</c:if>
+
+</lams:PageLearner>
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r14a43ff0db3bd18db9a56dde9555420f04347c47 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
+++ lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -16,161 +16,123 @@
    </listener>
 
    <tag>
-
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
       <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
       <name>WebAppURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
       </icon>
       <name>help</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Help tag</description>
          <name>module</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>toolSignature</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>page</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>style</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
       </icon>
       <name>Configuration</name>
       <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Get the configuration value for the specified key</description>
          <name>key</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
       <name>LAMSURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
       </icon>
       <name>html</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
          <description>Render html tag with direction and language</description>
          <name>xhtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
       <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
       <name>out</name>
       <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>value</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>escapeHtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts role name into form usable as message resources key</description>
       <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
       <name>role</name>
       <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts role name into form usable as message resources key</description>
          <name>role</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -192,7 +154,6 @@
  	  </attribute>
    </tag>
    <tag>
-
       <description>Output details from the shared session UserDTO object</description>
       <display-name>user details</display-name>
       <icon>    
@@ -205,14 +166,9 @@
          <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
-
-	
 	<tag>
       <description>Small portrait of a user</description>
       <display-name>User Portrait</display-name>
@@ -243,32 +199,61 @@
          <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
       </attribute>
    </tag>
-	
-	<tag-file>
-       <name>Tab</name>
-       <path>/WEB-INF/tags/Tab.tag</path>
-   	</tag-file>
+   <tag>
+	    <name>textarea</name>
+	    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
+	    <body-content>JSP</body-content>
+	    <dynamic-attributes>true</dynamic-attributes>
+	    <description>
+	    	Render text exactly same as  original input, which even won't escape the input HTML tag.
+	    </description>    
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>name</name>
+	        <required>true</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>id</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>onchange</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>disabled</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+  	</tag>
+  	
    	<tag-file>
-       <name>Tabs</name>
-       <path>/WEB-INF/tags/Tabs.tag</path>
-   	</tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+   	</tag-file> 
    	<tag-file>
-       <name>TabBody</name>
-       <path>/WEB-INF/tags/TabBody.tag</path>
-   	</tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
    	<tag-file>
-       <name>TabBodys</name>
-       <path>/WEB-INF/tags/TabBodys.tag</path>
+	    <name>Alert5</name>
+		<path>/WEB-INF/tags/Alert5.tag</path>
+   	</tag-file> 
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>TabBodyArea</name>
-       <path>/WEB-INF/tags/TabBodyArea.tag</path>
-   	</tag-file>
-   	<tag-file>
-       <name>CKEditor</name>
-       <path>/WEB-INF/tags/CKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   
@@ -281,86 +266,82 @@
        <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Rating</name>
-       <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>    		
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>StyledRating</name>
-       <path>/WEB-INF/tags/StyledRating.tag</path>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>headItems</name>
-       <path>/WEB-INF/tags/headItems.tag</path>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
-   	</tag-file>  
+   	</tag-file> 
    	<tag-file>
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Alert</name>
-		<path>/WEB-INF/tags/Alert.tag</path>
-   	</tag-file>  
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Page</name>
-		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>
+	    <name>errors</name>
+		<path>/WEB-INF/tags/Errors.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>TSTable</name>
-		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>    
-  	<tag-file>
-	    <name>Arrow</name>
-		<path>/WEB-INF/tags/Arrow.tag</path>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>AdvancedAccordian</name>
-       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
-   	</tag-file>  
-   	<tag-file>
-   		<name>RestrictedUsageAccordian</name>
-   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
    	</tag-file>
-  	<tag-file>
-	    <name>SimplePanel</name>
-		<path>/WEB-INF/tags/SimplePanel.tag</path>
-   	</tag-file>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>
    	<tag-file>
+       <name>headItems</name>
+       <path>/WEB-INF/tags/headItems.tag</path>
+   	</tag-file> 
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TextSearch</name>
-		<path>/WEB-INF/tags/TextSearch.tag</path>
-   	</tag-file>  
+       <name>Input</name>
+       <path>/WEB-INF/tags/Input.tag</path>
+   	</tag-file>
    	<tag-file>
+       <name>JSImport</name>
+       <path>/WEB-INF/tags/JSImport.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Notebook</name>
+		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file> 
    	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag-file>
-       <name>Etherpad</name>
-       <path>/WEB-INF/tags/Etherpad.tag</path>
-   	</tag-file> 
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
    	<tag-file>
-	    <name>errors</name>
-		<path>/WEB-INF/tags/Errors.tag</path>
-   	</tag-file> 
-   	<tag-file>
-	    <name>errors5</name>
-		<path>/WEB-INF/tags/Errors5.tag</path>
-   	</tag-file>    
-   	<tag-file>
-	    <name>Widget</name>
-		<path>/WEB-INF/tags/Widget.tag</path>
-   	</tag-file>   
-   	<tag-file>
 	    <name>Page5</name>
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
@@ -369,92 +350,71 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TSTable5</name>
-		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>  
+       <name>Popover</name>
+       <path>/WEB-INF/tags/Popover.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>WaitForLeader</name>
-		<path>/WEB-INF/tags/WaitForLeader.tag</path>
-   	</tag-file>  
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Alert5</name>
-		<path>/WEB-INF/tags/Alert5.tag</path>
-   	</tag-file>  
-   	<tag-file>
-       <name>FileUpload5</name>
-       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
-   	<tag>
-    <name>textarea</name>
-    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
-    <body-content>JSP</body-content>
-    <dynamic-attributes>true</dynamic-attributes>
-    <description>
-    	Render text exactly same as  original input, which even won't escape the input HTML tag.
-    </description>    
-    <attribute>
-        <description>
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>id</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>onchange</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>disabled</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-	<tag-file>
-		<name>head</name>
-	    <path>/WEB-INF/tags/Head.tag</path>
-	</tag-file>
-   	<tag-file>
-       <name>Comments</name>
-       <path>/WEB-INF/tags/Comments.tag</path>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>CommentsAuthor</name>
-       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
+   	</tag-file>    		
+   	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FileUpload</name>
-       <path>/WEB-INF/tags/FileUpload.tag</path>
+       <name>Switch</name>
+       <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>WaitingSpinner</name>
-       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>JSImport</name>
-       <path>/WEB-INF/tags/JSImport.tag</path>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Popover</name>
-       <path>/WEB-INF/tags/Popover.tag</path>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Input</name>
-       <path>/WEB-INF/tags/Input.tag</path>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Switch</name>
-       <path>/WEB-INF/tags/Switch.tag</path>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>TSTable5</name>
+		<path>/WEB-INF/tags/TSTable5.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
    	</tag-file>
+	<tag-file>
+	    <name>Widget</name>
+		<path>/WEB-INF/tags/Widget.tag</path>
+   	</tag-file> 
 </taglib>
\ No newline at end of file
Index: lams_tool_whiteboard/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u
--- lams_tool_whiteboard/web/WEB-INF/tags/Notebook.tag	(revision 0)
+++ lams_tool_whiteboard/web/WEB-INF/tags/Notebook.tag	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -0,0 +1,108 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="instructions" required="true" rtexprvalue="true"%>
+<%@ attribute name="formActionUrl" required="true" rtexprvalue="true"%>
+<%@ attribute name="formModelAttribute" required="false" rtexprvalue="true"%>
+<c:if test="${empty formModelAttribute}">
+	<c:set var="formModelAttribute" value="reflectionForm" />
+</c:if>
+<%@ attribute name="isNextActivityButtonSupported" required="true" rtexprvalue="true"%>
+<%@ attribute name="isLastActivity" required="false" rtexprvalue="true"%>
+<%@ attribute name="hiddenInputs" required="false" rtexprvalue="true"%>
+<c:if test="${empty hiddenInputs}">
+	<c:set var="hiddenInputs" value="userID,sessionMapID" />
+</c:if>
+<%@ attribute name="isNbTool" required="false" rtexprvalue="true"%>
+<c:if test="${empty isNbTool}">
+	<c:set var="isNbTool" value="false" />
+</c:if>
+
+<%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
+<%-- Default value for I18N keys --%> 
+<c:if test="${empty notebookLabelKey}">
+	<c:set var="notebookLabelKey" value="label.notebook" />
+</c:if>
+<c:if test="${empty finishButtonLabelKey}">
+	<c:set var="finishButtonLabelKey" value="label.submit" />
+</c:if>
+<c:if test="${empty nextActivityButtonLabelKey}">
+	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+</c:if>
+
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
+		}
+		function submitForm() {
+			var f = document.getElementById('reflectionForm');
+			f.submit();
+		}
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+	
+	<div id="instructions" class="instructions">
+		<lams:out value="${instructions}" escapeHtml="true" />
+	</div>
+	<hr class="mx-5">
+
+	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
+			<form:hidden path="${hiddenInput}" />
+		</c:forTokens>	
+			
+		<lams:errors5/>
+		
+		<div class="container-lg">
+			<div class="card lcard lcard-no-borders shadow mb-3">
+				<div class="card-header lcard-header-button-border">
+					<fmt:message key="${notebookLabelKey}" />
+				</div>
+				<div class="card-body mb-3">
+					<fmt:message key="${notebookLabelKey}" var="notebookLabel"/>
+					<form:textarea aria-label="${notebookLabel}" aria-multiline="true"
+						aria-required="true" required="true" path="entryText"
+						cssClass="form-control" id="focused" rows="5"></form:textarea>
+				</div>
+			</div>
+	
+			<div class="activity-bottom-buttons">
+				<button name="finishButton" id="finishButton" class="btn btn-primary">
+					<c:choose>
+						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
+							<fmt:message key="${finishButtonLabelKey}" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="${nextActivityButtonLabelKey}" />
+						</c:otherwise>
+					</c:choose>
+				</buttun>
+			</div>
+		
+		</div>
+	</form:form>
+	
+	<c:if test="${isNbTool}">
+		<!-- 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="${toolSessionID}"
+						   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
+						   pageSize="10" sortBy="1" />
+		</c:if>
+		<!-- End comments -->
+	</c:if>
+
+</lams:PageLearner>
\ No newline at end of file
Index: lams_tool_whiteboard/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r14a43ff0db3bd18db9a56dde9555420f04347c47 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_tool_whiteboard/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
+++ lams_tool_whiteboard/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -16,161 +16,123 @@
    </listener>
 
    <tag>
-
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
       <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
       <name>WebAppURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
       </icon>
       <name>help</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Help tag</description>
          <name>module</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>toolSignature</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>page</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>style</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
       </icon>
       <name>Configuration</name>
       <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Get the configuration value for the specified key</description>
          <name>key</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
       <name>LAMSURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
       </icon>
       <name>html</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
          <description>Render html tag with direction and language</description>
          <name>xhtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
       <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
       <name>out</name>
       <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>value</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>escapeHtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts role name into form usable as message resources key</description>
       <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
       <name>role</name>
       <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts role name into form usable as message resources key</description>
          <name>role</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -192,7 +154,6 @@
  	  </attribute>
    </tag>
    <tag>
-
       <description>Output details from the shared session UserDTO object</description>
       <display-name>user details</display-name>
       <icon>    
@@ -205,14 +166,9 @@
          <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
-
-	
 	<tag>
       <description>Small portrait of a user</description>
       <display-name>User Portrait</display-name>
@@ -243,32 +199,61 @@
          <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
       </attribute>
    </tag>
-	
-	<tag-file>
-       <name>Tab</name>
-       <path>/WEB-INF/tags/Tab.tag</path>
-   	</tag-file>
+   <tag>
+	    <name>textarea</name>
+	    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
+	    <body-content>JSP</body-content>
+	    <dynamic-attributes>true</dynamic-attributes>
+	    <description>
+	    	Render text exactly same as  original input, which even won't escape the input HTML tag.
+	    </description>    
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>name</name>
+	        <required>true</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>id</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>onchange</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>disabled</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+  	</tag>
+  	
    	<tag-file>
-       <name>Tabs</name>
-       <path>/WEB-INF/tags/Tabs.tag</path>
-   	</tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+   	</tag-file> 
    	<tag-file>
-       <name>TabBody</name>
-       <path>/WEB-INF/tags/TabBody.tag</path>
-   	</tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
    	<tag-file>
-       <name>TabBodys</name>
-       <path>/WEB-INF/tags/TabBodys.tag</path>
+	    <name>Alert5</name>
+		<path>/WEB-INF/tags/Alert5.tag</path>
+   	</tag-file> 
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>TabBodyArea</name>
-       <path>/WEB-INF/tags/TabBodyArea.tag</path>
-   	</tag-file>
-   	<tag-file>
-       <name>CKEditor</name>
-       <path>/WEB-INF/tags/CKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   
@@ -281,86 +266,82 @@
        <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Rating</name>
-       <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>    		
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>StyledRating</name>
-       <path>/WEB-INF/tags/StyledRating.tag</path>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>headItems</name>
-       <path>/WEB-INF/tags/headItems.tag</path>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
-   	</tag-file>  
+   	</tag-file> 
    	<tag-file>
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Alert</name>
-		<path>/WEB-INF/tags/Alert.tag</path>
-   	</tag-file>  
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Page</name>
-		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>
+	    <name>errors</name>
+		<path>/WEB-INF/tags/Errors.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>TSTable</name>
-		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>    
-  	<tag-file>
-	    <name>Arrow</name>
-		<path>/WEB-INF/tags/Arrow.tag</path>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>AdvancedAccordian</name>
-       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
-   	</tag-file>  
-   	<tag-file>
-   		<name>RestrictedUsageAccordian</name>
-   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
    	</tag-file>
-  	<tag-file>
-	    <name>SimplePanel</name>
-		<path>/WEB-INF/tags/SimplePanel.tag</path>
-   	</tag-file>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>
    	<tag-file>
+       <name>headItems</name>
+       <path>/WEB-INF/tags/headItems.tag</path>
+   	</tag-file> 
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TextSearch</name>
-		<path>/WEB-INF/tags/TextSearch.tag</path>
-   	</tag-file>  
+       <name>Input</name>
+       <path>/WEB-INF/tags/Input.tag</path>
+   	</tag-file>
    	<tag-file>
+       <name>JSImport</name>
+       <path>/WEB-INF/tags/JSImport.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Notebook</name>
+		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file> 
    	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag-file>
-       <name>Etherpad</name>
-       <path>/WEB-INF/tags/Etherpad.tag</path>
-   	</tag-file> 
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
    	<tag-file>
-	    <name>errors</name>
-		<path>/WEB-INF/tags/Errors.tag</path>
-   	</tag-file> 
-   	<tag-file>
-	    <name>errors5</name>
-		<path>/WEB-INF/tags/Errors5.tag</path>
-   	</tag-file>    
-   	<tag-file>
-	    <name>Widget</name>
-		<path>/WEB-INF/tags/Widget.tag</path>
-   	</tag-file>   
-   	<tag-file>
 	    <name>Page5</name>
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
@@ -369,92 +350,71 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TSTable5</name>
-		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>  
+       <name>Popover</name>
+       <path>/WEB-INF/tags/Popover.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>WaitForLeader</name>
-		<path>/WEB-INF/tags/WaitForLeader.tag</path>
-   	</tag-file>  
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Alert5</name>
-		<path>/WEB-INF/tags/Alert5.tag</path>
-   	</tag-file>  
-   	<tag-file>
-       <name>FileUpload5</name>
-       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
-   	<tag>
-    <name>textarea</name>
-    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
-    <body-content>JSP</body-content>
-    <dynamic-attributes>true</dynamic-attributes>
-    <description>
-    	Render text exactly same as  original input, which even won't escape the input HTML tag.
-    </description>    
-    <attribute>
-        <description>
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>id</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>onchange</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>disabled</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-	<tag-file>
-		<name>head</name>
-	    <path>/WEB-INF/tags/Head.tag</path>
-	</tag-file>
-   	<tag-file>
-       <name>Comments</name>
-       <path>/WEB-INF/tags/Comments.tag</path>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>CommentsAuthor</name>
-       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
+   	</tag-file>    		
+   	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FileUpload</name>
-       <path>/WEB-INF/tags/FileUpload.tag</path>
+       <name>Switch</name>
+       <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>WaitingSpinner</name>
-       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>JSImport</name>
-       <path>/WEB-INF/tags/JSImport.tag</path>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Popover</name>
-       <path>/WEB-INF/tags/Popover.tag</path>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Input</name>
-       <path>/WEB-INF/tags/Input.tag</path>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Switch</name>
-       <path>/WEB-INF/tags/Switch.tag</path>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>TSTable5</name>
+		<path>/WEB-INF/tags/TSTable5.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
    	</tag-file>
+	<tag-file>
+	    <name>Widget</name>
+		<path>/WEB-INF/tags/Widget.tag</path>
+   	</tag-file> 
 </taglib>
\ No newline at end of file
Index: lams_tool_wiki/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u
--- lams_tool_wiki/web/WEB-INF/tags/Notebook.tag	(revision 0)
+++ lams_tool_wiki/web/WEB-INF/tags/Notebook.tag	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -0,0 +1,108 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="instructions" required="true" rtexprvalue="true"%>
+<%@ attribute name="formActionUrl" required="true" rtexprvalue="true"%>
+<%@ attribute name="formModelAttribute" required="false" rtexprvalue="true"%>
+<c:if test="${empty formModelAttribute}">
+	<c:set var="formModelAttribute" value="reflectionForm" />
+</c:if>
+<%@ attribute name="isNextActivityButtonSupported" required="true" rtexprvalue="true"%>
+<%@ attribute name="isLastActivity" required="false" rtexprvalue="true"%>
+<%@ attribute name="hiddenInputs" required="false" rtexprvalue="true"%>
+<c:if test="${empty hiddenInputs}">
+	<c:set var="hiddenInputs" value="userID,sessionMapID" />
+</c:if>
+<%@ attribute name="isNbTool" required="false" rtexprvalue="true"%>
+<c:if test="${empty isNbTool}">
+	<c:set var="isNbTool" value="false" />
+</c:if>
+
+<%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
+<%-- Default value for I18N keys --%> 
+<c:if test="${empty notebookLabelKey}">
+	<c:set var="notebookLabelKey" value="label.notebook" />
+</c:if>
+<c:if test="${empty finishButtonLabelKey}">
+	<c:set var="finishButtonLabelKey" value="label.submit" />
+</c:if>
+<c:if test="${empty nextActivityButtonLabelKey}">
+	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+</c:if>
+
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
+		}
+		function submitForm() {
+			var f = document.getElementById('reflectionForm');
+			f.submit();
+		}
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+	
+	<div id="instructions" class="instructions">
+		<lams:out value="${instructions}" escapeHtml="true" />
+	</div>
+	<hr class="mx-5">
+
+	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
+			<form:hidden path="${hiddenInput}" />
+		</c:forTokens>	
+			
+		<lams:errors5/>
+		
+		<div class="container-lg">
+			<div class="card lcard lcard-no-borders shadow mb-3">
+				<div class="card-header lcard-header-button-border">
+					<fmt:message key="${notebookLabelKey}" />
+				</div>
+				<div class="card-body mb-3">
+					<fmt:message key="${notebookLabelKey}" var="notebookLabel"/>
+					<form:textarea aria-label="${notebookLabel}" aria-multiline="true"
+						aria-required="true" required="true" path="entryText"
+						cssClass="form-control" id="focused" rows="5"></form:textarea>
+				</div>
+			</div>
+	
+			<div class="activity-bottom-buttons">
+				<button name="finishButton" id="finishButton" class="btn btn-primary">
+					<c:choose>
+						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
+							<fmt:message key="${finishButtonLabelKey}" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="${nextActivityButtonLabelKey}" />
+						</c:otherwise>
+					</c:choose>
+				</buttun>
+			</div>
+		
+		</div>
+	</form:form>
+	
+	<c:if test="${isNbTool}">
+		<!-- 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="${toolSessionID}"
+						   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
+						   pageSize="10" sortBy="1" />
+		</c:if>
+		<!-- End comments -->
+	</c:if>
+
+</lams:PageLearner>
\ No newline at end of file
Index: lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r14a43ff0db3bd18db9a56dde9555420f04347c47 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
+++ lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -16,161 +16,123 @@
    </listener>
 
    <tag>
-
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
       <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
       <name>WebAppURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
       </icon>
       <name>help</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Help tag</description>
          <name>module</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>toolSignature</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>page</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>style</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
       </icon>
       <name>Configuration</name>
       <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Get the configuration value for the specified key</description>
          <name>key</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
       <name>LAMSURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
       </icon>
       <name>html</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
          <description>Render html tag with direction and language</description>
          <name>xhtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
       <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
       <name>out</name>
       <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>value</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>escapeHtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts role name into form usable as message resources key</description>
       <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
       <name>role</name>
       <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts role name into form usable as message resources key</description>
          <name>role</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -192,7 +154,6 @@
  	  </attribute>
    </tag>
    <tag>
-
       <description>Output details from the shared session UserDTO object</description>
       <display-name>user details</display-name>
       <icon>    
@@ -205,14 +166,9 @@
          <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
-
-	
 	<tag>
       <description>Small portrait of a user</description>
       <display-name>User Portrait</display-name>
@@ -243,32 +199,61 @@
          <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
       </attribute>
    </tag>
-	
-	<tag-file>
-       <name>Tab</name>
-       <path>/WEB-INF/tags/Tab.tag</path>
-   	</tag-file>
+   <tag>
+	    <name>textarea</name>
+	    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
+	    <body-content>JSP</body-content>
+	    <dynamic-attributes>true</dynamic-attributes>
+	    <description>
+	    	Render text exactly same as  original input, which even won't escape the input HTML tag.
+	    </description>    
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>name</name>
+	        <required>true</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>id</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>onchange</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>disabled</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+  	</tag>
+  	
    	<tag-file>
-       <name>Tabs</name>
-       <path>/WEB-INF/tags/Tabs.tag</path>
-   	</tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+   	</tag-file> 
    	<tag-file>
-       <name>TabBody</name>
-       <path>/WEB-INF/tags/TabBody.tag</path>
-   	</tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
    	<tag-file>
-       <name>TabBodys</name>
-       <path>/WEB-INF/tags/TabBodys.tag</path>
+	    <name>Alert5</name>
+		<path>/WEB-INF/tags/Alert5.tag</path>
+   	</tag-file> 
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>TabBodyArea</name>
-       <path>/WEB-INF/tags/TabBodyArea.tag</path>
-   	</tag-file>
-   	<tag-file>
-       <name>CKEditor</name>
-       <path>/WEB-INF/tags/CKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   
@@ -281,86 +266,82 @@
        <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Rating</name>
-       <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>    		
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>StyledRating</name>
-       <path>/WEB-INF/tags/StyledRating.tag</path>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>headItems</name>
-       <path>/WEB-INF/tags/headItems.tag</path>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
-   	</tag-file>  
+   	</tag-file> 
    	<tag-file>
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Alert</name>
-		<path>/WEB-INF/tags/Alert.tag</path>
-   	</tag-file>  
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Page</name>
-		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>
+	    <name>errors</name>
+		<path>/WEB-INF/tags/Errors.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>TSTable</name>
-		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>    
-  	<tag-file>
-	    <name>Arrow</name>
-		<path>/WEB-INF/tags/Arrow.tag</path>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>AdvancedAccordian</name>
-       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
-   	</tag-file>  
-   	<tag-file>
-   		<name>RestrictedUsageAccordian</name>
-   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
    	</tag-file>
-  	<tag-file>
-	    <name>SimplePanel</name>
-		<path>/WEB-INF/tags/SimplePanel.tag</path>
-   	</tag-file>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>
    	<tag-file>
+       <name>headItems</name>
+       <path>/WEB-INF/tags/headItems.tag</path>
+   	</tag-file> 
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TextSearch</name>
-		<path>/WEB-INF/tags/TextSearch.tag</path>
-   	</tag-file>  
+       <name>Input</name>
+       <path>/WEB-INF/tags/Input.tag</path>
+   	</tag-file>
    	<tag-file>
+       <name>JSImport</name>
+       <path>/WEB-INF/tags/JSImport.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Notebook</name>
+		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file> 
    	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag-file>
-       <name>Etherpad</name>
-       <path>/WEB-INF/tags/Etherpad.tag</path>
-   	</tag-file> 
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
    	<tag-file>
-	    <name>errors</name>
-		<path>/WEB-INF/tags/Errors.tag</path>
-   	</tag-file> 
-   	<tag-file>
-	    <name>errors5</name>
-		<path>/WEB-INF/tags/Errors5.tag</path>
-   	</tag-file>    
-   	<tag-file>
-	    <name>Widget</name>
-		<path>/WEB-INF/tags/Widget.tag</path>
-   	</tag-file>   
-   	<tag-file>
 	    <name>Page5</name>
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
@@ -369,92 +350,71 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TSTable5</name>
-		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>  
+       <name>Popover</name>
+       <path>/WEB-INF/tags/Popover.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>WaitForLeader</name>
-		<path>/WEB-INF/tags/WaitForLeader.tag</path>
-   	</tag-file>  
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Alert5</name>
-		<path>/WEB-INF/tags/Alert5.tag</path>
-   	</tag-file>  
-   	<tag-file>
-       <name>FileUpload5</name>
-       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
-   	<tag>
-    <name>textarea</name>
-    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
-    <body-content>JSP</body-content>
-    <dynamic-attributes>true</dynamic-attributes>
-    <description>
-    	Render text exactly same as  original input, which even won't escape the input HTML tag.
-    </description>    
-    <attribute>
-        <description>
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>id</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>onchange</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>disabled</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-	<tag-file>
-		<name>head</name>
-	    <path>/WEB-INF/tags/Head.tag</path>
-	</tag-file>
-   	<tag-file>
-       <name>Comments</name>
-       <path>/WEB-INF/tags/Comments.tag</path>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>CommentsAuthor</name>
-       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
+   	</tag-file>    		
+   	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FileUpload</name>
-       <path>/WEB-INF/tags/FileUpload.tag</path>
+       <name>Switch</name>
+       <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>WaitingSpinner</name>
-       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>JSImport</name>
-       <path>/WEB-INF/tags/JSImport.tag</path>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Popover</name>
-       <path>/WEB-INF/tags/Popover.tag</path>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Input</name>
-       <path>/WEB-INF/tags/Input.tag</path>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Switch</name>
-       <path>/WEB-INF/tags/Switch.tag</path>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>TSTable5</name>
+		<path>/WEB-INF/tags/TSTable5.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
    	</tag-file>
+	<tag-file>
+	    <name>Widget</name>
+		<path>/WEB-INF/tags/Widget.tag</path>
+   	</tag-file> 
 </taglib>
\ No newline at end of file
Index: lams_tool_zoom/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u
--- lams_tool_zoom/web/WEB-INF/tags/Notebook.tag	(revision 0)
+++ lams_tool_zoom/web/WEB-INF/tags/Notebook.tag	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -0,0 +1,108 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="instructions" required="true" rtexprvalue="true"%>
+<%@ attribute name="formActionUrl" required="true" rtexprvalue="true"%>
+<%@ attribute name="formModelAttribute" required="false" rtexprvalue="true"%>
+<c:if test="${empty formModelAttribute}">
+	<c:set var="formModelAttribute" value="reflectionForm" />
+</c:if>
+<%@ attribute name="isNextActivityButtonSupported" required="true" rtexprvalue="true"%>
+<%@ attribute name="isLastActivity" required="false" rtexprvalue="true"%>
+<%@ attribute name="hiddenInputs" required="false" rtexprvalue="true"%>
+<c:if test="${empty hiddenInputs}">
+	<c:set var="hiddenInputs" value="userID,sessionMapID" />
+</c:if>
+<%@ attribute name="isNbTool" required="false" rtexprvalue="true"%>
+<c:if test="${empty isNbTool}">
+	<c:set var="isNbTool" value="false" />
+</c:if>
+
+<%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
+<%-- Default value for I18N keys --%> 
+<c:if test="${empty notebookLabelKey}">
+	<c:set var="notebookLabelKey" value="label.notebook" />
+</c:if>
+<c:if test="${empty finishButtonLabelKey}">
+	<c:set var="finishButtonLabelKey" value="label.submit" />
+</c:if>
+<c:if test="${empty nextActivityButtonLabelKey}">
+	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+</c:if>
+
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
+		}
+		function submitForm() {
+			var f = document.getElementById('reflectionForm');
+			f.submit();
+		}
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+	
+	<div id="instructions" class="instructions">
+		<lams:out value="${instructions}" escapeHtml="true" />
+	</div>
+	<hr class="mx-5">
+
+	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
+			<form:hidden path="${hiddenInput}" />
+		</c:forTokens>	
+			
+		<lams:errors5/>
+		
+		<div class="container-lg">
+			<div class="card lcard lcard-no-borders shadow mb-3">
+				<div class="card-header lcard-header-button-border">
+					<fmt:message key="${notebookLabelKey}" />
+				</div>
+				<div class="card-body mb-3">
+					<fmt:message key="${notebookLabelKey}" var="notebookLabel"/>
+					<form:textarea aria-label="${notebookLabel}" aria-multiline="true"
+						aria-required="true" required="true" path="entryText"
+						cssClass="form-control" id="focused" rows="5"></form:textarea>
+				</div>
+			</div>
+	
+			<div class="activity-bottom-buttons">
+				<button name="finishButton" id="finishButton" class="btn btn-primary">
+					<c:choose>
+						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
+							<fmt:message key="${finishButtonLabelKey}" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="${nextActivityButtonLabelKey}" />
+						</c:otherwise>
+					</c:choose>
+				</buttun>
+			</div>
+		
+		</div>
+	</form:form>
+	
+	<c:if test="${isNbTool}">
+		<!-- 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="${toolSessionID}"
+						   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
+						   pageSize="10" sortBy="1" />
+		</c:if>
+		<!-- End comments -->
+	</c:if>
+
+</lams:PageLearner>
\ No newline at end of file
Index: lams_tool_zoom/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r14a43ff0db3bd18db9a56dde9555420f04347c47 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_tool_zoom/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
+++ lams_tool_zoom/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -16,161 +16,123 @@
    </listener>
 
    <tag>
-
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
       <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
       <name>WebAppURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
       </icon>
       <name>help</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Help tag</description>
          <name>module</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>toolSignature</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>page</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>style</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
       </icon>
       <name>Configuration</name>
       <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Get the configuration value for the specified key</description>
          <name>key</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
       <name>LAMSURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
       </icon>
       <name>html</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
          <description>Render html tag with direction and language</description>
          <name>xhtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
       <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
       <name>out</name>
       <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>value</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>escapeHtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts role name into form usable as message resources key</description>
       <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
       <name>role</name>
       <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts role name into form usable as message resources key</description>
          <name>role</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -192,7 +154,6 @@
  	  </attribute>
    </tag>
    <tag>
-
       <description>Output details from the shared session UserDTO object</description>
       <display-name>user details</display-name>
       <icon>    
@@ -205,14 +166,9 @@
          <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
-
-	
 	<tag>
       <description>Small portrait of a user</description>
       <display-name>User Portrait</display-name>
@@ -243,32 +199,61 @@
          <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
       </attribute>
    </tag>
-	
-	<tag-file>
-       <name>Tab</name>
-       <path>/WEB-INF/tags/Tab.tag</path>
-   	</tag-file>
+   <tag>
+	    <name>textarea</name>
+	    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
+	    <body-content>JSP</body-content>
+	    <dynamic-attributes>true</dynamic-attributes>
+	    <description>
+	    	Render text exactly same as  original input, which even won't escape the input HTML tag.
+	    </description>    
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>name</name>
+	        <required>true</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>id</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>onchange</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>disabled</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+  	</tag>
+  	
    	<tag-file>
-       <name>Tabs</name>
-       <path>/WEB-INF/tags/Tabs.tag</path>
-   	</tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+   	</tag-file> 
    	<tag-file>
-       <name>TabBody</name>
-       <path>/WEB-INF/tags/TabBody.tag</path>
-   	</tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
    	<tag-file>
-       <name>TabBodys</name>
-       <path>/WEB-INF/tags/TabBodys.tag</path>
+	    <name>Alert5</name>
+		<path>/WEB-INF/tags/Alert5.tag</path>
+   	</tag-file> 
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>TabBodyArea</name>
-       <path>/WEB-INF/tags/TabBodyArea.tag</path>
-   	</tag-file>
-   	<tag-file>
-       <name>CKEditor</name>
-       <path>/WEB-INF/tags/CKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   
@@ -281,86 +266,82 @@
        <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Rating</name>
-       <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>    		
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>StyledRating</name>
-       <path>/WEB-INF/tags/StyledRating.tag</path>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>headItems</name>
-       <path>/WEB-INF/tags/headItems.tag</path>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
-   	</tag-file>  
+   	</tag-file> 
    	<tag-file>
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Alert</name>
-		<path>/WEB-INF/tags/Alert.tag</path>
-   	</tag-file>  
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Page</name>
-		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>
+	    <name>errors</name>
+		<path>/WEB-INF/tags/Errors.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>TSTable</name>
-		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>    
-  	<tag-file>
-	    <name>Arrow</name>
-		<path>/WEB-INF/tags/Arrow.tag</path>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>AdvancedAccordian</name>
-       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
-   	</tag-file>  
-   	<tag-file>
-   		<name>RestrictedUsageAccordian</name>
-   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
    	</tag-file>
-  	<tag-file>
-	    <name>SimplePanel</name>
-		<path>/WEB-INF/tags/SimplePanel.tag</path>
-   	</tag-file>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>
    	<tag-file>
+       <name>headItems</name>
+       <path>/WEB-INF/tags/headItems.tag</path>
+   	</tag-file> 
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TextSearch</name>
-		<path>/WEB-INF/tags/TextSearch.tag</path>
-   	</tag-file>  
+       <name>Input</name>
+       <path>/WEB-INF/tags/Input.tag</path>
+   	</tag-file>
    	<tag-file>
+       <name>JSImport</name>
+       <path>/WEB-INF/tags/JSImport.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Notebook</name>
+		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file> 
    	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag-file>
-       <name>Etherpad</name>
-       <path>/WEB-INF/tags/Etherpad.tag</path>
-   	</tag-file> 
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
    	<tag-file>
-	    <name>errors</name>
-		<path>/WEB-INF/tags/Errors.tag</path>
-   	</tag-file> 
-   	<tag-file>
-	    <name>errors5</name>
-		<path>/WEB-INF/tags/Errors5.tag</path>
-   	</tag-file>    
-   	<tag-file>
-	    <name>Widget</name>
-		<path>/WEB-INF/tags/Widget.tag</path>
-   	</tag-file>   
-   	<tag-file>
 	    <name>Page5</name>
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
@@ -369,92 +350,71 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TSTable5</name>
-		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>  
+       <name>Popover</name>
+       <path>/WEB-INF/tags/Popover.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>WaitForLeader</name>
-		<path>/WEB-INF/tags/WaitForLeader.tag</path>
-   	</tag-file>  
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Alert5</name>
-		<path>/WEB-INF/tags/Alert5.tag</path>
-   	</tag-file>  
-   	<tag-file>
-       <name>FileUpload5</name>
-       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
-   	<tag>
-    <name>textarea</name>
-    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
-    <body-content>JSP</body-content>
-    <dynamic-attributes>true</dynamic-attributes>
-    <description>
-    	Render text exactly same as  original input, which even won't escape the input HTML tag.
-    </description>    
-    <attribute>
-        <description>
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>id</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>onchange</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>disabled</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-	<tag-file>
-		<name>head</name>
-	    <path>/WEB-INF/tags/Head.tag</path>
-	</tag-file>
-   	<tag-file>
-       <name>Comments</name>
-       <path>/WEB-INF/tags/Comments.tag</path>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>CommentsAuthor</name>
-       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
+   	</tag-file>    		
+   	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FileUpload</name>
-       <path>/WEB-INF/tags/FileUpload.tag</path>
+       <name>Switch</name>
+       <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>WaitingSpinner</name>
-       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>JSImport</name>
-       <path>/WEB-INF/tags/JSImport.tag</path>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Popover</name>
-       <path>/WEB-INF/tags/Popover.tag</path>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Input</name>
-       <path>/WEB-INF/tags/Input.tag</path>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Switch</name>
-       <path>/WEB-INF/tags/Switch.tag</path>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>TSTable5</name>
+		<path>/WEB-INF/tags/TSTable5.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
    	</tag-file>
+	<tag-file>
+	    <name>Widget</name>
+		<path>/WEB-INF/tags/Widget.tag</path>
+   	</tag-file> 
 </taglib>
\ No newline at end of file
Index: lams_www/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u
--- lams_www/web/WEB-INF/tags/Notebook.tag	(revision 0)
+++ lams_www/web/WEB-INF/tags/Notebook.tag	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -0,0 +1,108 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="instructions" required="true" rtexprvalue="true"%>
+<%@ attribute name="formActionUrl" required="true" rtexprvalue="true"%>
+<%@ attribute name="formModelAttribute" required="false" rtexprvalue="true"%>
+<c:if test="${empty formModelAttribute}">
+	<c:set var="formModelAttribute" value="reflectionForm" />
+</c:if>
+<%@ attribute name="isNextActivityButtonSupported" required="true" rtexprvalue="true"%>
+<%@ attribute name="isLastActivity" required="false" rtexprvalue="true"%>
+<%@ attribute name="hiddenInputs" required="false" rtexprvalue="true"%>
+<c:if test="${empty hiddenInputs}">
+	<c:set var="hiddenInputs" value="userID,sessionMapID" />
+</c:if>
+<%@ attribute name="isNbTool" required="false" rtexprvalue="true"%>
+<c:if test="${empty isNbTool}">
+	<c:set var="isNbTool" value="false" />
+</c:if>
+
+<%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
+<%-- Default value for I18N keys --%> 
+<c:if test="${empty notebookLabelKey}">
+	<c:set var="notebookLabelKey" value="label.notebook" />
+</c:if>
+<c:if test="${empty finishButtonLabelKey}">
+	<c:set var="finishButtonLabelKey" value="label.submit" />
+</c:if>
+<c:if test="${empty nextActivityButtonLabelKey}">
+	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+</c:if>
+
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
+		}
+		function submitForm() {
+			var f = document.getElementById('reflectionForm');
+			f.submit();
+		}
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+	
+	<div id="instructions" class="instructions">
+		<lams:out value="${instructions}" escapeHtml="true" />
+	</div>
+	<hr class="mx-5">
+
+	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
+			<form:hidden path="${hiddenInput}" />
+		</c:forTokens>	
+			
+		<lams:errors5/>
+		
+		<div class="container-lg">
+			<div class="card lcard lcard-no-borders shadow mb-3">
+				<div class="card-header lcard-header-button-border">
+					<fmt:message key="${notebookLabelKey}" />
+				</div>
+				<div class="card-body mb-3">
+					<fmt:message key="${notebookLabelKey}" var="notebookLabel"/>
+					<form:textarea aria-label="${notebookLabel}" aria-multiline="true"
+						aria-required="true" required="true" path="entryText"
+						cssClass="form-control" id="focused" rows="5"></form:textarea>
+				</div>
+			</div>
+	
+			<div class="activity-bottom-buttons">
+				<button name="finishButton" id="finishButton" class="btn btn-primary">
+					<c:choose>
+						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
+							<fmt:message key="${finishButtonLabelKey}" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="${nextActivityButtonLabelKey}" />
+						</c:otherwise>
+					</c:choose>
+				</buttun>
+			</div>
+		
+		</div>
+	</form:form>
+	
+	<c:if test="${isNbTool}">
+		<!-- 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="${toolSessionID}"
+						   toolSignature="lanb11" likeAndDislike="${likeAndDislike}" readOnly="true"
+						   pageSize="10" sortBy="1" />
+		</c:if>
+		<!-- End comments -->
+	</c:if>
+
+</lams:PageLearner>
\ No newline at end of file
Index: lams_www/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r14a43ff0db3bd18db9a56dde9555420f04347c47 -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a
--- lams_www/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
+++ lams_www/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
@@ -16,161 +16,123 @@
    </listener>
 
    <tag>
-
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
       <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
       <name>WebAppURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
       </icon>
       <name>help</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Help tag</description>
          <name>module</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>toolSignature</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>page</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Help tag</description>
          <name>style</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
       </icon>
       <name>Configuration</name>
       <tag-class>org.lamsfoundation.lams.web.tag.ConfigurationTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Get the configuration value for the specified key</description>
          <name>key</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
       <name>LAMSURL</name>
       <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
-
    </tag>
    <tag>
-
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
       </icon>
       <name>html</name>
       <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
       <body-content>JSP</body-content>
-
       <attribute>
          <description>Render html tag with direction and language</description>
          <name>xhtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
       <display-name>Converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
       <icon>    
       </icon>
       <name>out</name>
       <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>value</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
          <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
          <name>escapeHtml</name>
          <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Converts role name into form usable as message resources key</description>
       <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
       <name>role</name>
       <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
-
       <attribute>
          <description>Converts role name into form usable as message resources key</description>
          <name>role</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
    <tag>
-
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -192,7 +154,6 @@
  	  </attribute>
    </tag>
    <tag>
-
       <description>Output details from the shared session UserDTO object</description>
       <display-name>user details</display-name>
       <icon>    
@@ -205,14 +166,9 @@
          <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
+         <rtexprvalue>true</rtexprvalue>
       </attribute>
-
    </tag>
-
-	
 	<tag>
       <description>Small portrait of a user</description>
       <display-name>User Portrait</display-name>
@@ -243,32 +199,61 @@
          <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
       </attribute>
    </tag>
-	
-	<tag-file>
-       <name>Tab</name>
-       <path>/WEB-INF/tags/Tab.tag</path>
-   	</tag-file>
+   <tag>
+	    <name>textarea</name>
+	    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
+	    <body-content>JSP</body-content>
+	    <dynamic-attributes>true</dynamic-attributes>
+	    <description>
+	    	Render text exactly same as  original input, which even won't escape the input HTML tag.
+	    </description>    
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>name</name>
+	        <required>true</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>id</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>onchange</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+	    <attribute>
+	        <description>
+	        </description>
+	        <name>disabled</name>
+	        <required>false</required>
+	        <rtexprvalue>true</rtexprvalue>
+	    </attribute>
+  	</tag>
+  	
    	<tag-file>
-       <name>Tabs</name>
-       <path>/WEB-INF/tags/Tabs.tag</path>
-   	</tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+   	</tag-file> 
    	<tag-file>
-       <name>TabBody</name>
-       <path>/WEB-INF/tags/TabBody.tag</path>
-   	</tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
    	<tag-file>
-       <name>TabBodys</name>
-       <path>/WEB-INF/tags/TabBodys.tag</path>
+	    <name>Alert5</name>
+		<path>/WEB-INF/tags/Alert5.tag</path>
+   	</tag-file> 
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>TabBodyArea</name>
-       <path>/WEB-INF/tags/TabBodyArea.tag</path>
-   	</tag-file>
-   	<tag-file>
-       <name>CKEditor</name>
-       <path>/WEB-INF/tags/CKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   
@@ -281,86 +266,82 @@
        <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Rating</name>
-       <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>    		
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>StyledRating</name>
-       <path>/WEB-INF/tags/StyledRating.tag</path>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>headItems</name>
-       <path>/WEB-INF/tags/headItems.tag</path>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
-   	</tag-file>  
+   	</tag-file> 
    	<tag-file>
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Alert</name>
-		<path>/WEB-INF/tags/Alert.tag</path>
-   	</tag-file>  
+       <name>Etherpad</name>
+       <path>/WEB-INF/tags/Etherpad.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Page</name>
-		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>
+	    <name>errors</name>
+		<path>/WEB-INF/tags/Errors.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>TSTable</name>
-		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>    
-  	<tag-file>
-	    <name>Arrow</name>
-		<path>/WEB-INF/tags/Arrow.tag</path>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>AdvancedAccordian</name>
-       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
-   	</tag-file>  
-   	<tag-file>
-   		<name>RestrictedUsageAccordian</name>
-   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
    	</tag-file>
-  	<tag-file>
-	    <name>SimplePanel</name>
-		<path>/WEB-INF/tags/SimplePanel.tag</path>
-   	</tag-file>
+	<tag-file>
+		<name>head</name>
+	    <path>/WEB-INF/tags/Head.tag</path>
+	</tag-file>
    	<tag-file>
+       <name>headItems</name>
+       <path>/WEB-INF/tags/headItems.tag</path>
+   	</tag-file> 
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TextSearch</name>
-		<path>/WEB-INF/tags/TextSearch.tag</path>
-   	</tag-file>  
+       <name>Input</name>
+       <path>/WEB-INF/tags/Input.tag</path>
+   	</tag-file>
    	<tag-file>
+       <name>JSImport</name>
+       <path>/WEB-INF/tags/JSImport.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Notebook</name>
+		<path>/WEB-INF/tags/Notebook.tag</path>
    	</tag-file> 
    	<tag-file>
        <name>OutcomeAuthor</name>
        <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag-file>
-       <name>Etherpad</name>
-       <path>/WEB-INF/tags/Etherpad.tag</path>
-   	</tag-file> 
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
    	<tag-file>
-	    <name>errors</name>
-		<path>/WEB-INF/tags/Errors.tag</path>
-   	</tag-file> 
-   	<tag-file>
-	    <name>errors5</name>
-		<path>/WEB-INF/tags/Errors5.tag</path>
-   	</tag-file>    
-   	<tag-file>
-	    <name>Widget</name>
-		<path>/WEB-INF/tags/Widget.tag</path>
-   	</tag-file>   
-   	<tag-file>
 	    <name>Page5</name>
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
@@ -369,92 +350,71 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>TSTable5</name>
-		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>  
+       <name>Popover</name>
+       <path>/WEB-INF/tags/Popover.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>WaitForLeader</name>
-		<path>/WEB-INF/tags/WaitForLeader.tag</path>
-   	</tag-file>  
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file> 
    	<tag-file>
-	    <name>Alert5</name>
-		<path>/WEB-INF/tags/Alert5.tag</path>
-   	</tag-file>  
-   	<tag-file>
-       <name>FileUpload5</name>
-       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
-   	<tag>
-    <name>textarea</name>
-    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
-    <body-content>JSP</body-content>
-    <dynamic-attributes>true</dynamic-attributes>
-    <description>
-    	Render text exactly same as  original input, which even won't escape the input HTML tag.
-    </description>    
-    <attribute>
-        <description>
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>id</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>onchange</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-        </description>
-        <name>disabled</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-	<tag-file>
-		<name>head</name>
-	    <path>/WEB-INF/tags/Head.tag</path>
-	</tag-file>
-   	<tag-file>
-       <name>Comments</name>
-       <path>/WEB-INF/tags/Comments.tag</path>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>CommentsAuthor</name>
-       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
+   	</tag-file>    		
+   	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FileUpload</name>
-       <path>/WEB-INF/tags/FileUpload.tag</path>
+       <name>Switch</name>
+       <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
+	<tag-file>
+       <name>Tab</name>
+       <path>/WEB-INF/tags/Tab.tag</path>
+   	</tag-file>
    	<tag-file>
-       <name>WaitingSpinner</name>
-       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+       <name>Tabs</name>
+       <path>/WEB-INF/tags/Tabs.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>JSImport</name>
-       <path>/WEB-INF/tags/JSImport.tag</path>
+       <name>TabBody</name>
+       <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Popover</name>
-       <path>/WEB-INF/tags/Popover.tag</path>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Input</name>
-       <path>/WEB-INF/tags/Input.tag</path>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>Switch</name>
-       <path>/WEB-INF/tags/Switch.tag</path>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>TSTable5</name>
+		<path>/WEB-INF/tags/TSTable5.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
    	</tag-file>
+	<tag-file>
+	    <name>Widget</name>
+		<path>/WEB-INF/tags/Widget.tag</path>
+   	</tag-file> 
 </taglib>
\ No newline at end of file