Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbAuthoringController.java
===================================================================
diff -u -r0d58de1fbc5b7e7ab913902946d3368c14ccfb98 -r52b9e7960ddce8e644d0e4f9a77603df1465600d
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbAuthoringController.java	(.../NbAuthoringController.java)	(revision 0d58de1fbc5b7e7ab913902946d3368c14ccfb98)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbAuthoringController.java	(.../NbAuthoringController.java)	(revision 52b9e7960ddce8e644d0e4f9a77603df1465600d)
@@ -97,17 +97,11 @@
     @RequestMapping("/authoring")
     public String unspecified(@ModelAttribute NbAuthoringForm nbAuthoringForm, HttpServletRequest request,
 	    HttpServletResponse response) {
-	/*
-	 * Retrieve the Service
-	 */
-	String contentIdString = nbAuthoringForm.getToolContentID();
-//	Long contentId = NbWebUtil.convertToLong(nbAuthoringForm.getToolContentID());
-//	String contentFolderId = nbAuthoringForm.getContentFolderID();
 
 	Long contentId = WebUtil.readLongParam(request, NoticeboardConstants.TOOL_CONTENT_ID);
 	String contentFolderId = WebUtil.readStrParam(request, NoticeboardConstants.CONTENT_FOLDER_ID);
 
-	nbAuthoringForm.setToolContentID(contentIdString);
+	nbAuthoringForm.setToolContentID(contentId.toString());
 
 	/*
 	 * DefineLater is used in the basic screen. If defineLater is set, then in the authoring page,
@@ -188,7 +182,7 @@
 	String idAsString = nbAuthoringForm.getToolContentID();
 
 	if (idAsString == null) {
-	    String error = messageService.getMessage(NoticeboardConstants.ERR_MISSING_PARAM, "Tool Content Id");
+	    String error = messageService.getMessage("error.missingParam");
 	    logger.error(error);
 	    throw new NbApplicationException(error);
 	}
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbLearnerController.java
===================================================================
diff -u -r99ab61277d430fb532c14c217f14fa763aa4def9 -r52b9e7960ddce8e644d0e4f9a77603df1465600d
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbLearnerController.java	(.../NbLearnerController.java)	(revision 99ab61277d430fb532c14c217f14fa763aa4def9)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbLearnerController.java	(.../NbLearnerController.java)	(revision 52b9e7960ddce8e644d0e4f9a77603df1465600d)
@@ -279,7 +279,7 @@
 	errorMap = new LinkedMultiValueMap<>();
 	if (isDefineLaterSet) {
 	    if (isDefineLaterSet) {
-		errorMap.add("GLOBAL", "message.defineLaterSet");
+		errorMap.add("GLOBAL", messageService.getMessage("message.defineLaterSet"));
 	    }
 	    return true;
 	} else {
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbPedagogicalPlannerController.java
===================================================================
diff -u -r0d58de1fbc5b7e7ab913902946d3368c14ccfb98 -r52b9e7960ddce8e644d0e4f9a77603df1465600d
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbPedagogicalPlannerController.java	(.../NbPedagogicalPlannerController.java)	(revision 0d58de1fbc5b7e7ab913902946d3368c14ccfb98)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbPedagogicalPlannerController.java	(.../NbPedagogicalPlannerController.java)	(revision 52b9e7960ddce8e644d0e4f9a77603df1465600d)
@@ -34,7 +34,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Controller;
-import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -78,8 +77,7 @@
     public String saveOrUpdatePedagogicalPlannerForm(@ModelAttribute NbPedagogicalPlannerForm plannerForm,
 	    HttpServletRequest request) {
 
-	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
-	errorMap = plannerForm.validate();
+	MultiValueMap<String, String> errorMap = plannerForm.validate();
 	if (errorMap.isEmpty()) {
 	    String content = plannerForm.getBasicContent();
 	    Long toolContentID = plannerForm.getToolContentID();
Index: lams_tool_nb/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r0d58de1fbc5b7e7ab913902946d3368c14ccfb98 -r52b9e7960ddce8e644d0e4f9a77603df1465600d
--- lams_tool_nb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 0d58de1fbc5b7e7ab913902946d3368c14ccfb98)
+++ lams_tool_nb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 52b9e7960ddce8e644d0e4f9a77603df1465600d)
@@ -4,6 +4,7 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
@@ -88,7 +89,8 @@
 					</c:if>
 				</c:if>
 			</c:if>
-			<c:if test="${empty toolSessionId}">
+			<c:if test="${empty toolSessionId and not empty formID}">
+				<c:set var="toolForm" value="${requestScope[formID]}" />
 				<c:if test="${not empty toolForm}"> 
 				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
 				</c:if>
@@ -433,4 +435,4 @@
 		</div>
 		</div>
 	</c:otherwise>
-</c:choose>
+</c:choose>
\ No newline at end of file
Index: lams_tool_nb/web/WEB-INF/tags/TextSearch.tag
===================================================================
diff -u -r0d58de1fbc5b7e7ab913902946d3368c14ccfb98 -r52b9e7960ddce8e644d0e4f9a77603df1465600d
--- lams_tool_nb/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision 0d58de1fbc5b7e7ab913902946d3368c14ccfb98)
+++ lams_tool_nb/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision 52b9e7960ddce8e644d0e4f9a77603df1465600d)
@@ -32,11 +32,11 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
 <%-- Required attributes --%>
 <%@ attribute name="sessionMapID" required="true" rtexprvalue="true" %>
-<%@ attribute name="wrapInFormTag" required="true" rtexprvalue="true" %>
 
 <%-- Optional attributes --%>
 <%@ attribute name="action" required="false" rtexprvalue="true" %>
@@ -52,10 +52,10 @@
 
 <%-- Default value for message key --%>
 <c:if test="${empty action}">
-	<c:set var="action" value="authoring/textsearch.do" scope="request"/>
+	<c:set var="action" value="textsearch.do" scope="request"/>
 </c:if>
 <c:if test="${empty cancelAction}">
-	<c:set var="cancelAction" value="authoring/textsearchCancel.do" scope="request"/>
+	<c:set var="cancelAction" value="textsearchCancel.do" scope="request"/>
 </c:if>
 <c:if test="${empty formID}">
 	<c:set var="formID" value="textSearchForm" scope="request"/>
@@ -84,52 +84,40 @@
 
 <!-- begin text search form content -->
 	
-<c:if test="${wrapInFormTag}">
-	<form action="${action}" id="${formID}" name="${formID}">
-</c:if>
-		<input type="hidden" name="sessionMapID" />
-		<h4><fmt:message key="${headingLabelKey}" /></h4>
-		<table>
-			<tr>
-				<td>
-					<fmt:message key="${allWordsLabelKey}" />
-				</td>
-				<td>
-					<input type="text" size="40" name="allWords" />
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<fmt:message key="${phraseLabelKey}" />
-				</td>
-				<td>
-					<input type="text" size="40" name="phrase" />
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<fmt:message key="${anyWordsLabelKey}" />
-				</td>
-				<td>
-					<input type="text" size="40" name="anyWords" /> 
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<fmt:message key="${excludedWordsLabelKey}" />
-				</td>
-				<td>
-					<input type="text" size="40" name="excludedWords" /> 
-				</td>
-			</tr>
-		</table>
-<c:if test="${wrapInFormTag}">
-	<lams:ImgButtonWrapper>
-		<a href="#" onclick="${formID}.submit();" class="button-add-item"><fmt:message key="${saveButtonLabelKey}" />
-		</a>
-		<a href="#" onclick="location.href='${cancelAction}'" class="button space-left"><fmt:message key="${cancelButtonLabelKey}" />
-		</a>
-	</lams:ImgButtonWrapper>
-	</form>
-</c:if>
+	<form:hidden path="sessionMapID" />
+	<h4><fmt:message key="${headingLabelKey}" /></h4>
+	<table>
+		<tr>
+			<td>
+				<fmt:message key="${allWordsLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="allWords" />
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="${phraseLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="phrase" />
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="${anyWordsLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="anyWords" /> 
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="${excludedWordsLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="excludedWords" /> 
+			</td>
+		</tr>
+	</table>
 <!-- end text search form content -->
\ No newline at end of file
Index: lams_tool_nb/web/authoring/authoring.jsp
===================================================================
diff -u -r692cfbd845483c893176e6a4eb78d789399977ba -r52b9e7960ddce8e644d0e4f9a77603df1465600d
--- lams_tool_nb/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 692cfbd845483c893176e6a4eb78d789399977ba)
+++ lams_tool_nb/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 52b9e7960ddce8e644d0e4f9a77603df1465600d)
@@ -56,7 +56,7 @@
 <form:form modelAttribute="nbAuthoringForm" action="save.do" id="nbAuthoringForm" enctype="multipart/form-data">
 
 <c:set var="title"><fmt:message key="activity.title" /></c:set>
-<lams:Page title="${title}" type="navbar">
+<lams:Page title="${title}" type="navbar" formID="nbAuthoringForm">
 
 			<form:hidden path="toolContentID" />
 			<form:hidden path="contentFolderID" />
Index: lams_tool_nb/web/learnerContent.jsp
===================================================================
diff -u -r99ab61277d430fb532c14c217f14fa763aa4def9 -r52b9e7960ddce8e644d0e4f9a77603df1465600d
--- lams_tool_nb/web/learnerContent.jsp	(.../learnerContent.jsp)	(revision 99ab61277d430fb532c14c217f14fa763aa4def9)
+++ lams_tool_nb/web/learnerContent.jsp	(.../learnerContent.jsp)	(revision 52b9e7960ddce8e644d0e4f9a77603df1465600d)
@@ -22,19 +22,24 @@
 			finishButton.disabled = true;
 		}
 	}
-	function submitForm(methodName) {
-		var f = document.getElementById('nbLearnerForm');
-		f.action += methodName + ".do";
-		f.submit();
+	
+	function reflect() {
+		var submitUrl = "<lams:WebAppURL />"+${mode}+"/reflect.do?sessionMapID=${sessionMapID}";
+		return submitCount(submitUrl);
 	}
+	
+	function finish() {
+		var finishUrl = "<lams:WebAppURL />"+${mode}+"/finish.do?sessionMapID=${sessionMapID}";
+		return submitCount(finishUrl);
+	}
 </script>
 
-<lams:Page type="learner" title="${nbLearnerForm.title}">
+<lams:Page type="learner" title="${nbLearnerForm.title}" formID="nbLearnerForm">
 	<div class="panel">
 		<c:out value="${nbLearnerForm.basicContent}" escapeXml="false" />
 	</div>
 
-	<form:form action="/learning/" modelAttribute="nbLearnerForm" target="_self" onsubmit="disableFinishButton();" id="nbLearnerForm">
+	<form:form action="${mode}.do" modelAttribute="nbLearnerForm" target="_self" onsubmit="disableFinishButton();" id="nbLearnerForm">
 		<form:hidden path="mode" />
 		<form:hidden path="toolSessionID" />
 
@@ -67,15 +72,15 @@
 				<c:when test="${reflectOnActivity}">
 
 					<button  name="continueButton" class="btn btn-sm btn-primary pull-right"
-						onclick="submitForm('reflect')">
+						onclick="javascript:reflect();">
 						<fmt:message key="button.continue" />
 					</button>
 				</c:when>
 				<c:otherwise>
 
 
 					<a href="#nogo" name="finishButton" class="btn btn-primary pull-right voffset10 na"
-						onclick="submitForm('finish')">
+						onclick="javascript:finish();">
 						<c:choose>
 							<c:when test="${activityPosition.last}">
 								<fmt:message key="button.submit" />
Index: lams_tool_nb/web/monitoring/m_EditActivity.jsp
===================================================================
diff -u -r0d58de1fbc5b7e7ab913902946d3368c14ccfb98 -r52b9e7960ddce8e644d0e4f9a77603df1465600d
--- lams_tool_nb/web/monitoring/m_EditActivity.jsp	(.../m_EditActivity.jsp)	(revision 0d58de1fbc5b7e7ab913902946d3368c14ccfb98)
+++ lams_tool_nb/web/monitoring/m_EditActivity.jsp	(.../m_EditActivity.jsp)	(revision 52b9e7960ddce8e644d0e4f9a77603df1465600d)
@@ -28,7 +28,7 @@
 </table>
 
 <p class="align-right">
-	<c:url value="authoring/authoring.do" var="authoringUrl">
+	<c:url value="/authoring/authoring.do" var="authoringUrl">
 		<c:param name="toolContentID" value="${toolContentID}" />
 		<c:param name="defineLater" value="true" />
 		<c:param name="contentFolderID" value="${contentFolderID}" />
Index: lams_tool_nb/web/monitoring/monitoring.jsp
===================================================================
diff -u -re998cf2de8c4714022559cb5f67e61b677a2dd28 -r52b9e7960ddce8e644d0e4f9a77603df1465600d
--- lams_tool_nb/web/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision e998cf2de8c4714022559cb5f67e61b677a2dd28)
+++ lams_tool_nb/web/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 52b9e7960ddce8e644d0e4f9a77603df1465600d)
@@ -43,7 +43,7 @@
 		</c:set>
 			
 		<c:set var="title"><fmt:message key="activity.title" /></c:set>
-		<lams:Page title="${title}" type="navbar">
+		<lams:Page title="${title}" type="navbar" formID="nbMonitoringForm">
 
 		 	<lams:Tabs title="${title}" helpToolSignature="<%= NoticeboardConstants.TOOL_SIGNATURE %>" helpModule="monitoring">
 				<lams:Tab id="1" key="titleHeading.summary" />
Index: lams_tool_nb/web/reflect.jsp
===================================================================
diff -u -r692cfbd845483c893176e6a4eb78d789399977ba -r52b9e7960ddce8e644d0e4f9a77603df1465600d
--- lams_tool_nb/web/reflect.jsp	(.../reflect.jsp)	(revision 692cfbd845483c893176e6a4eb78d789399977ba)
+++ lams_tool_nb/web/reflect.jsp	(.../reflect.jsp)	(revision 52b9e7960ddce8e644d0e4f9a77603df1465600d)
@@ -25,7 +25,7 @@
 	}
 </script>
 
-<lams:Page type="learner" title="${title}">
+<lams:Page type="learner" title="${title}" formID="nbLearnerForm">
 
 	<form:form action="/reflect.do" method="post" onsubmit="disableFinishButton();" modelAttribute="nbLearnerForm" id="nbLearnerForm">
 		<div class="form-group">