Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml
===================================================================
diff -u -ra2d72bee6029b7e05e8cd696c02db214f3049365 -re998cf2de8c4714022559cb5f67e61b677a2dd28
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml	(.../nbApplicationContext.xml)	(revision a2d72bee6029b7e05e8cd696c02db214f3049365)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml	(.../nbApplicationContext.xml)	(revision e998cf2de8c4714022559cb5f67e61b677a2dd28)
@@ -54,7 +54,11 @@
 	</bean> 
 
 	<bean id="nbMessageService" class="org.lamsfoundation.lams.util.MessageService" >
-		<property name="messageSource"><ref bean="nbMessageSource"/></property>										
+		<property name="messageSource">
+			<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
+				<property name="basename"><value>org.lamsfoundation.lams.tool.noticeboard.ApplicationResources</value></property>
+			</bean>
+		</property>										
 	</bean>
 
 	<!--  DAO classes -->
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbAuthoringController.java
===================================================================
diff -u -ra2d72bee6029b7e05e8cd696c02db214f3049365 -re998cf2de8c4714022559cb5f67e61b677a2dd28
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbAuthoringController.java	(.../NbAuthoringController.java)	(revision a2d72bee6029b7e05e8cd696c02db214f3049365)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbAuthoringController.java	(.../NbAuthoringController.java)	(revision e998cf2de8c4714022559cb5f67e61b677a2dd28)
@@ -24,6 +24,7 @@
 package org.lamsfoundation.lams.tool.noticeboard.web.controller;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
@@ -65,7 +66,6 @@
  * @author mtruong
  */
 @Controller
-@RequestMapping("/authoring")
 public class NbAuthoringController {
 
     private static Logger logger = Logger.getLogger(NbAuthoringController.class.getName());
@@ -92,16 +92,25 @@
 	return user;
     }
 
-    public String unspecified(@ModelAttribute NbAuthoringForm nbAuthoringForm, HttpServletRequest request) {
+    @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();
+	
+	
+	//throws exception if the content id does not exist
+	checkContentId(contentId);
+	
+//	Long contentId = WebUtil.readLongParam(request, NoticeboardConstants.TOOL_CONTENT_ID);
+//	String contentFolderId = WebUtil.readStrParam(request, NoticeboardConstants.CONTENT_FOLDER_ID);
 
-	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,
 	 * the two tabs {Advanced, Instructions} are not visible.
@@ -157,6 +166,7 @@
 	}
 
 	request.setAttribute(FORM, nbAuthoringForm);
+	
 	return "authoring/authoring";
     }
 
@@ -177,6 +187,7 @@
 
     }
 
+    @RequestMapping("/save")
     public String save(@ModelAttribute NbAuthoringForm nbAuthoringForm, HttpServletRequest request) {
 
 	//copyAuthoringFormValuesIntoFormBean(request, nbForm);
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbLearnerController.java
===================================================================
diff -u -ra2d72bee6029b7e05e8cd696c02db214f3049365 -re998cf2de8c4714022559cb5f67e61b677a2dd28
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbLearnerController.java	(.../NbLearnerController.java)	(revision a2d72bee6029b7e05e8cd696c02db214f3049365)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbLearnerController.java	(.../NbLearnerController.java)	(revision e998cf2de8c4714022559cb5f67e61b677a2dd28)
@@ -119,13 +119,14 @@
      * @param response
      * @return
      */
-    public String finish(@ModelAttribute NbLearnerForm learnerForm, HttpServletRequest request,
+    @RequestMapping("/finish")
+    public String finish(@ModelAttribute NbLearnerForm nbLearnerForm, HttpServletRequest request,
 	    HttpServletResponse response)
 	    throws NbApplicationException, ToolException, DataMissingException, ServletException, IOException {
 
 	Long userID = getUserID(request);
 
-	Long toolSessionID = NbWebUtil.convertToLong(learnerForm.getToolSessionID());
+	Long toolSessionID = NbWebUtil.convertToLong(nbLearnerForm.getToolSessionID());
 	if (toolSessionID == null) {
 	    String error = "Unable to continue. The parameters tool session id is missing";
 	    logger.error(error);
@@ -135,7 +136,7 @@
 	ToolSessionManager sessionMgrService = NoticeboardServiceProxy
 		.getNbSessionManager(applicationContext.getServletContext());
 
-	ToolAccessMode mode = WebUtil.getToolAccessMode(learnerForm.getMode());
+	ToolAccessMode mode = WebUtil.getToolAccessMode(nbLearnerForm.getMode());
 	if (mode == ToolAccessMode.LEARNER || mode == ToolAccessMode.AUTHOR) {
 	    NoticeboardSession nbSession = nbService.retrieveNoticeboardSession(toolSessionID);
 	    NoticeboardUser nbUser = nbService.retrieveNbUserBySession(userID, toolSessionID);
@@ -154,10 +155,10 @@
 		if (entry == null) {
 		    // create new entry
 		    nbService.createNotebookEntry(toolSessionID, CoreNotebookConstants.NOTEBOOK_TOOL,
-			    NoticeboardConstants.TOOL_SIGNATURE, userID.intValue(), learnerForm.getReflectionText());
+			    NoticeboardConstants.TOOL_SIGNATURE, userID.intValue(), nbLearnerForm.getReflectionText());
 		} else {
 		    // update existing entry
-		    entry.setEntry(learnerForm.getReflectionText());
+		    entry.setEntry(nbLearnerForm.getReflectionText());
 		    entry.setLastModified(new Date());
 		    nbService.updateEntry(entry);
 		}
@@ -167,10 +168,10 @@
 	    try {
 		nextActivityUrl = sessionMgrService.leaveToolSession(toolSessionID, getUserID(request));
 	    } catch (DataMissingException e) {
-		log.error(e);
+		logger.error(e);
 		throw new ServletException(e);
 	    } catch (ToolException e) {
-		log.error(e);
+		logger.error(e);
 		throw new ServletException(e);
 	    }
 
@@ -181,7 +182,7 @@
 	}
 	request.setAttribute(NoticeboardConstants.READ_ONLY_MODE, "true");
 
-	return ".learnerContent";
+	return "learnerContent";
 
     }
 
@@ -195,9 +196,10 @@
      * @param response
      * @return
      */
-    public String reflect(@ModelAttribute NbLearnerForm learnerForm, HttpServletRequest request) {
+    @RequestMapping("/reflect")
+    public String reflect(@ModelAttribute NbLearnerForm nbLearnerForm, HttpServletRequest request) {
 
-	Long toolSessionID = NbWebUtil.convertToLong(learnerForm.getToolSessionID());
+	Long toolSessionID = NbWebUtil.convertToLong(nbLearnerForm.getToolSessionID());
 	NoticeboardContent nbContent = nbService.retrieveNoticeboardBySessionID(toolSessionID);
 	request.setAttribute("reflectInstructions", nbContent.getReflectInstructions());
 	request.setAttribute("title", nbContent.getTitle());
@@ -215,6 +217,6 @@
 	LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request,
 		applicationContext.getServletContext());
 
-	return ".reflectOnActivity";
+	return "reflect";
     }
 }
\ No newline at end of file
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbLearnerStarterController.java
===================================================================
diff -u -ra2d72bee6029b7e05e8cd696c02db214f3049365 -re998cf2de8c4714022559cb5f67e61b677a2dd28
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbLearnerStarterController.java	(.../NbLearnerStarterController.java)	(revision a2d72bee6029b7e05e8cd696c02db214f3049365)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbLearnerStarterController.java	(.../NbLearnerStarterController.java)	(revision e998cf2de8c4714022559cb5f67e61b677a2dd28)
@@ -75,7 +75,7 @@
  *
  */
 @Controller
-@RequestMapping("/starter/learner")
+@RequestMapping("/starter")
 public class NbLearnerStarterController {
 
     static Logger logger = Logger.getLogger(NbLearnerStarterController.class.getName());
@@ -114,21 +114,21 @@
 	return WebUtil.readLongParam(request, AttributeNames.PARAM_USER_ID, false);
     }
 
-    public String unspecified(@ModelAttribute NbLearnerForm learnerForm, Errors errors, HttpServletRequest request,
+    public String unspecified(@ModelAttribute NbLearnerForm NbLearnerForm, Errors errors, HttpServletRequest request,
 	    HttpServletResponse response) {
 
-	return learner(learnerForm, errors, request, response);
+	return learner(NbLearnerForm, errors, request, response);
     }
 
     @RequestMapping("/learner")
-    public String learner(@ModelAttribute NbLearnerForm learnerForm, Errors errors, HttpServletRequest request,
+    public String learner(@ModelAttribute NbLearnerForm NbLearnerForm, Errors errors, HttpServletRequest request,
 	    HttpServletResponse response) {
 
 	NoticeboardContent nbContent = null;
 	NoticeboardUser nbUser = null;
-	saveMessages(request, null);
+//	saveMessages(request, null);
 
-	Long toolSessionID = NbWebUtil.convertToLong(learnerForm.getToolSessionID());
+	Long toolSessionID = NbWebUtil.convertToLong(NbLearnerForm.getToolSessionID());
 
 	if (toolSessionID == null) {
 	    String error = "Unable to continue. The parameters tool session id is missing";
@@ -177,7 +177,7 @@
 	    readOnly = true;
 	}
 
-	learnerForm.copyValuesIntoForm(nbContent, readOnly, mode.toString());
+	NbLearnerForm.copyValuesIntoForm(nbContent, readOnly, mode.toString());
 
 	NotebookEntry notebookEntry = nbService.getEntry(toolSessionID, CoreNotebookConstants.NOTEBOOK_TOOL,
 		NoticeboardConstants.TOOL_SIGNATURE, userID.intValue());
@@ -201,25 +201,27 @@
 	 * If the particular flag is set, control is forwarded to jsp page
 	 * displaying to the user the message according to what flag is set.
 	 */
-	if (displayMessageToUser(nbContent, errors)) {
-	    saveMessages(request, message);
-	    return ("displayMessage");
-	}
+//	if (displayMessageToUser(nbContent, errors)) {
+//	    saveMessages(request, message);
+//A	    request.setAttribute("messageForm", );	
+//A	    return ("message");
+//	}
 
 	return "learnerContent";
 
     }
 
     @RequestMapping("/teacher")
-    public String teacher(@ModelAttribute NbLearnerForm learnerForm, Errors errors, HttpServletRequest request,
+    public String teacher(@ModelAttribute NbLearnerForm NbLearnerForm, Errors errors, HttpServletRequest request,
 	    HttpServletResponse response) throws NbApplicationException {
-	return learner(learnerForm, errors, request, response);
+	return learner(NbLearnerForm, errors, request, response);
     }
 
-    public String author(@ModelAttribute NbLearnerForm learnerForm, Errors errors, HttpServletRequest request,
+    @RequestMapping("/author")
+    public String author(@ModelAttribute NbLearnerForm NbLearnerForm, Errors errors, HttpServletRequest request,
 	    HttpServletResponse response) throws NbApplicationException {
 
-	return learner(learnerForm, errors, request, response);
+	return learner(NbLearnerForm, errors, request, response);
 
     }
 
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbMonitoringController.java
===================================================================
diff -u -ra2d72bee6029b7e05e8cd696c02db214f3049365 -re998cf2de8c4714022559cb5f67e61b677a2dd28
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbMonitoringController.java	(.../NbMonitoringController.java)	(revision a2d72bee6029b7e05e8cd696c02db214f3049365)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbMonitoringController.java	(.../NbMonitoringController.java)	(revision e998cf2de8c4714022559cb5f67e61b677a2dd28)
@@ -31,7 +31,6 @@
 import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
@@ -60,7 +59,6 @@
  * @author mtruong
  */
 @Controller
-@RequestMapping("/monitoring")
 public class NbMonitoringController {
 
     static Logger logger = Logger.getLogger(NbMonitoringController.class.getName());
@@ -71,8 +69,8 @@
 
     public final static String FORM = "NbMonitoringForm";
 
-    public String unspecified(@ModelAttribute NbMonitoringForm monitorForm, HttpServletRequest request,
-	    HttpServletResponse response) throws NbApplicationException {
+    @RequestMapping("/monitoring")
+    public String unspecified(@ModelAttribute NbMonitoringForm nbMonitoringForm, HttpServletRequest request) {
 
 	Long toolContentId = NbWebUtil.convertToLong(request.getParameter(NoticeboardConstants.TOOL_CONTENT_ID));
 	String contentFolderID = WebUtil.readStrParam(request, NoticeboardConstants.CONTENT_FOLDER_ID);
@@ -84,14 +82,14 @@
 
 	NoticeboardContent content = nbService.retrieveNoticeboard(toolContentId);
 
-	monitorForm.setTitle(content.getTitle());
-	monitorForm.setBasicContent(content.getContent());
+	nbMonitoringForm.setTitle(content.getTitle());
+	nbMonitoringForm.setBasicContent(content.getContent());
 
 	request.setAttribute(NoticeboardConstants.TOOL_CONTENT_ID, toolContentId);
 	request.setAttribute(NoticeboardConstants.CONTENT_FOLDER_ID, contentFolderID);
 
 	//Get the total number of learners that have participated in this tool activity
-	monitorForm.setTotalLearners(nbService.calculateTotalNumberOfUsers(toolContentId));
+	nbMonitoringForm.setTotalLearners(nbService.calculateTotalNumberOfUsers(toolContentId));
 
 	Set sessions = content.getNbSessions();
 	Iterator i = sessions.iterator();
@@ -121,8 +119,8 @@
 		}
 	    }
 	}
-	monitorForm.setGroupStatsMap(numUsersMap);
-	monitorForm.setSessionIdMap(sessionIdMap);
+	nbMonitoringForm.setGroupStatsMap(numUsersMap);
+	nbMonitoringForm.setSessionIdMap(sessionIdMap);
 
 	boolean isGroupedActivity = nbService.isGroupedActivity(toolContentId);
 	request.setAttribute("isGroupedActivity", isGroupedActivity);
@@ -135,11 +133,12 @@
 	request.setAttribute("allowComments", content.isAllowComments());
 
 	String currentTab = WebUtil.readStrParam(request, AttributeNames.PARAM_CURRENT_TAB, true);
-	monitorForm.setCurrentTab(currentTab != null ? currentTab : "1");
-	request.setAttribute(FORM, monitorForm);
-	return "monitorPage";
+	nbMonitoringForm.setCurrentTab(currentTab != null ? currentTab : "1");
+	request.setAttribute(FORM, nbMonitoringForm);
+	return "/monitoring/monitoring";
     }
 
+    @RequestMapping("/reflection")
     public String viewReflection(HttpServletRequest request) {
 	Long userId = NbWebUtil.convertToLong(request.getParameter(NoticeboardConstants.USER_ID));
 	Long toolSessionId = NbWebUtil.convertToLong(request.getParameter(NoticeboardConstants.TOOL_SESSION_ID));
@@ -151,17 +150,18 @@
 	    request.setAttribute("name", nbUser.getFullname());
 	}
 
-	return "monitorReflectionPage";
+	return "/monitoring/reflection";
     }
 
+    @RequestMapping("/comments")
     public String viewComments(HttpServletRequest request) {
 
 	Long toolSessionID = WebUtil.readLongParam(request, NoticeboardConstants.TOOL_SESSION_ID, false);
 	NoticeboardContent nbContent = nbService.retrieveNoticeboardBySessionID(toolSessionID);
 
 	request.setAttribute(NoticeboardConstants.TOOL_SESSION_ID, toolSessionID);
 	request.setAttribute("anonymous", nbContent.isAllowAnonymous());
-	return "monitorCommentsPage";
+	return "monitoring/comments";
     }
 
 }
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbPedagogicalPlannerController.java
===================================================================
diff -u -ra2d72bee6029b7e05e8cd696c02db214f3049365 -re998cf2de8c4714022559cb5f67e61b677a2dd28
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbPedagogicalPlannerController.java	(.../NbPedagogicalPlannerController.java)	(revision a2d72bee6029b7e05e8cd696c02db214f3049365)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbPedagogicalPlannerController.java	(.../NbPedagogicalPlannerController.java)	(revision e998cf2de8c4714022559cb5f67e61b677a2dd28)
@@ -61,6 +61,7 @@
 	return initPedagogicalPlannerForm(plannerForm, request);
     }
 
+    @RequestMapping("/init")
     public String initPedagogicalPlannerForm(@ModelAttribute NbPedagogicalPlannerForm plannerForm,
 	    HttpServletRequest request) {
 	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
@@ -72,6 +73,7 @@
 
     }
 
+    @RequestMapping("/saveorupdate")
     public String saveOrUpdatePedagogicalPlannerForm(@ModelAttribute NbPedagogicalPlannerForm plannerForm,
 	    Errors errors, HttpServletRequest request) {
 
Index: lams_tool_nb/web/WEB-INF/web.xml
===================================================================
diff -u -ra2d72bee6029b7e05e8cd696c02db214f3049365 -re998cf2de8c4714022559cb5f67e61b677a2dd28
--- lams_tool_nb/web/WEB-INF/web.xml	(.../web.xml)	(revision a2d72bee6029b7e05e8cd696c02db214f3049365)
+++ lams_tool_nb/web/WEB-INF/web.xml	(.../web.xml)	(revision e998cf2de8c4714022559cb5f67e61b677a2dd28)
@@ -3,6 +3,7 @@
 <web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
 	version="3.1">
+	
 	<context-param>
 		<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
 		<param-value>org.lamsfoundation.lams.tool.noticeboard.ApplicationResources</param-value>
@@ -12,19 +13,22 @@
 		<param-name>contextConfigLocation</param-name>
 		<param-value>classpath:/org/lamsfoundation/lams/tool/noticeboard/dbupdates/autopatchContext.xml</param-value>
 	</context-param>
+	
 	<context-param>
 		<param-name>locatorFactorySelector</param-name>
 		<param-value>classpath:/org/lamsfoundation/lams/beanRefContext.xml</param-value>
 	</context-param>
+	
 	<context-param>
 		<param-name>parentContextKey</param-name>
 		<param-value>context.central</param-value>
 	</context-param>
 
-	<filter>
-		<filter-name>SystemSessionFilter</filter-name>
-		<filter-class>org.lamsfoundation.lams.web.session.SystemSessionFilter</filter-class>
-	</filter>
+	<listener>
+		<listener-class>
+			org.springframework.web.context.ContextLoaderListener
+		</listener-class>
+	</listener>
 
 	<filter>
 		<filter-name>hibernateFilter</filter-name>
@@ -36,8 +40,14 @@
 			<param-value>coreSessionFactory</param-value>
 		</init-param>
 	</filter>
-
+	<!-- System session filter -->
 	<filter>
+		<filter-name>SystemSessionFilter</filter-name>
+		<filter-class>
+			org.lamsfoundation.lams.web.session.SystemSessionFilter
+		</filter-class>
+	</filter>
+	<filter>
 		<filter-name>LocaleFilter</filter-name>
 		<filter-class>
 			org.lamsfoundation.lams.web.filter.LocaleFilter
@@ -49,49 +59,19 @@
 	</filter>
 
 	<filter-mapping>
-		<filter-name>SystemSessionFilter</filter-name>
+		<filter-name>hibernateFilter</filter-name>
 		<url-pattern>/*</url-pattern>
 	</filter-mapping>
-
 	<filter-mapping>
-		<filter-name>hibernateFilter</filter-name>
+		<filter-name>SystemSessionFilter</filter-name>
 		<url-pattern>/*</url-pattern>
 	</filter-mapping>
-
 	<filter-mapping>
 		<filter-name>LocaleFilter</filter-name>
 		<url-pattern>/*</url-pattern>
 	</filter-mapping>
 
-	<listener>
-		<listener-class>
-			org.springframework.web.context.ContextLoaderListener
-		</listener-class>
-	</listener>
-
 	<servlet>
-		<servlet-name>action</servlet-name>
-		<servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
-		<init-param>
-			<param-name>config</param-name>
-			<param-value>/WEB-INF/struts-config.xml</param-value>
-		</init-param>
-		<init-param>
-			<param-name>debug</param-name>
-			<param-value>999</param-value>
-		</init-param>
-		<init-param>
-			<param-name>detail</param-name>
-			<param-value>2</param-value>
-		</init-param>
-		<init-param>
-			<param-name>validate</param-name>
-			<param-value>true</param-value>
-		</init-param>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	
-	<servlet>
 		<servlet-name>spring</servlet-name>
 		<servlet-class>
 			org.springframework.web.servlet.DispatcherServlet
@@ -112,14 +92,16 @@
 		</init-param>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
-	
+
 	<!-- The download servlet, reused from the content repository jar -->
 	<servlet>
+		<description>Instructions Download</description>
+		<display-name>Instructions Download</display-name>
 		<servlet-name>download</servlet-name>
 		<servlet-class>org.lamsfoundation.lams.contentrepository.client.ToolDownload</servlet-class>
 		<init-param>
 			<param-name>toolContentHandlerBeanName</param-name>
-			<param-value>nbToolContentHandler</param-value>
+			<param-value>lataskTaskListToolContentHandler</param-value>
 		</init-param>
 		<load-on-startup>3</load-on-startup>
 	</servlet>
@@ -140,21 +122,7 @@
 	</servlet-mapping>
 
 
-	<error-page>
-		<error-code>500</error-code>
-		<location>/error.jsp</location>
-	</error-page>
-	<error-page>
-		<error-code>403</error-code>
-		<location>/403.jsp</location>
-	</error-page>
-	<error-page>
-		<error-code>404</error-code>
-		<location>/404.jsp</location>
-	</error-page>
-
 	<jsp-config>
-
 		<!-- ======================================================== -->
 		<!-- Struts Tag Library Descriptors -->
 		<!-- ======================================================== -->
@@ -209,17 +177,20 @@
 			<taglib-uri>tags-xml</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/jstl/x.tld</taglib-location>
 		</taglib>
+		
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library: Apache implementation of TLV -->
 		<!-- ======================================================== -->
 		<taglib>
 			<taglib-uri>tags-permittedTaglibs</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/jstl/permittedTaglibs.tld</taglib-location>
 		</taglib>
+
 		<taglib>
 			<taglib-uri>tags-scriptfree</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/jstl/scriptfree.tld</taglib-location>
 		</taglib>
+		
 		<!-- ======================================================== -->
 		<!-- Customized Tag Library -->
 		<!-- ======================================================== -->
@@ -252,8 +223,7 @@
 		<web-resource-collection>
 			<web-resource-name>Authoring content</web-resource-name>
 			<url-pattern>/authoring/*</url-pattern>
-			<url-pattern>/authoring.do</url-pattern>
-			<url-pattern>/pedagogicalPlanner.do</url-pattern>
+			<url-pattern>/pages/authoring/*</url-pattern>
 			<http-method>GET</http-method>
  			<http-method>POST</http-method>
 		</web-resource-collection>
@@ -267,7 +237,8 @@
 		<web-resource-collection>
 			<web-resource-name>Staff content</web-resource-name>
 			<url-pattern>/monitoring/*</url-pattern>
-			<url-pattern>/monitoring.do</url-pattern>
+			<url-pattern>/pages/monitoring/*</url-pattern>
+			<url-pattern>/definelater.do</url-pattern>
 			<http-method>GET</http-method>
  			<http-method>POST</http-method>
 		</web-resource-collection>
@@ -297,10 +268,12 @@
 		<description>Group Manager</description>
 		<role-name>GROUP MANAGER</role-name>
 	</security-role>
+
 	<security-role>
 		<description>Group Administrator</description>
 		<role-name>GROUP ADMIN</role-name>
 	</security-role>
+
 	<security-role>
 		<description>LAMS System Adminstrator</description>
 		<role-name>SYSADMIN</role-name>
@@ -315,4 +288,17 @@
 			<form-error-page>/login.jsp?failed=y</form-error-page>
 		</form-login-config>
 	</login-config>
+
+	<error-page>
+		<error-code>500</error-code>
+		<location>/error.jsp</location>
+	</error-page>
+	<error-page>
+		<error-code>403</error-code>
+		<location>/403.jsp</location>
+	</error-page>
+	<error-page>
+		<error-code>404</error-code>
+		<location>/404.jsp</location>
+	</error-page>
 </web-app>
\ No newline at end of file
Index: lams_tool_nb/web/authoring/advance.jsp
===================================================================
diff -u -ra2d72bee6029b7e05e8cd696c02db214f3049365 -re998cf2de8c4714022559cb5f67e61b677a2dd28
--- lams_tool_nb/web/authoring/advance.jsp	(.../advance.jsp)	(revision a2d72bee6029b7e05e8cd696c02db214f3049365)
+++ lams_tool_nb/web/authoring/advance.jsp	(.../advance.jsp)	(revision e998cf2de8c4714022559cb5f67e61b677a2dd28)
@@ -8,13 +8,11 @@
 
 <div class="checkbox">
 	<label for="reflectOnActivity">
-    <form:checkbox path="reflectOnActivity" value="1"
-		cssClass="noBorder" id="reflectOnActivity"/>
-		<fmt:message key="advanced.reflectOnActivity" />
+    <form:checkbox path="reflectOnActivity" value="1" cssClass="noBorder" id="ReflectOnActivity"/><fmt:message key="advanced.reflectOnActivity" />
 	</label>
 </div>
 <div class="form-group">
-	<textarea name="reflectInstructions" cols="60" rows="3"  id="reflectInstructions" class="form-control"/>
+	<form:textarea path="reflectInstructions" cols="60" rows="3"  id="reflectInstructions" cssClass="form-control"></form:textarea>
 </div>
 </lams:SimplePanel>
 
Index: lams_tool_nb/web/authoring/authoring.jsp
===================================================================
diff -u -ra2d72bee6029b7e05e8cd696c02db214f3049365 -re998cf2de8c4714022559cb5f67e61b677a2dd28
--- lams_tool_nb/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision a2d72bee6029b7e05e8cd696c02db214f3049365)
+++ lams_tool_nb/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision e998cf2de8c4714022559cb5f67e61b677a2dd28)
@@ -1,8 +1,6 @@
 <!DOCTYPE html>
-            
-
+           
 <%@ include file="/includes/taglibs.jsp"%>
-
 <%@ page import="org.lamsfoundation.lams.tool.noticeboard.NoticeboardConstants"%>
 <c:set var="lams">
 	<lams:LAMSURL />
@@ -55,15 +53,15 @@
 
 <body class="stripes" onLoad="init()">
 
-<form:form modelAttribute="authoringForm" action="authoring.do" id="authoringForm" target="_self" enctype="multipart/form-data">
+<form:form modelAttribute="nbAuthoringForm" action="authoring.do" id="nbAuthoringForm" enctype="multipart/form-data">
 
 <c:set var="title"><fmt:message key="activity.title" /></c:set>
 <lams:Page title="${title}" type="navbar">
 
-			<form:hidden property="toolContentID" />
-			<form:hidden property="contentFolderID" />
-			<form:hidden property="currentTab" styleId="currentTab" />
-			<form:hidden property="defineLater" />
+			<form:hidden path="toolContentID" />
+			<form:hidden path="contentFolderID" />
+			<form:hidden path="currentTab" id="currentTab" />
+			<form:hidden path="defineLater" />
 		
 		 	<lams:Tabs control="true" title="${title}" helpToolSignature="<%= NoticeboardConstants.TOOL_SIGNATURE %>" helpModule="authoring">
 				<lams:Tab id="1" key="label.authoring.heading.basic" />
@@ -87,7 +85,7 @@
   				</lams:TabBodys>
 		
 				<!-- Button Row -->
-				<form:hidden property="method" value="save" />
+				<form:hidden path="method" value="save" />
 				<c:set var="accessMode">
 					<c:choose>
 						<c:when test="${NbAuthoringForm.defineLater == 'true'}">
@@ -98,7 +96,7 @@
 						</c:otherwise>
 					</c:choose>
 				</c:set>
-				<lams:AuthoringButton formID="authoringForm"
+				<lams:AuthoringButton formID="nbAuthoringForm"
 					clearSessionActionUrl="/clearsession.do" toolSignature="lanb11"
 					toolContentID="${NbAuthoringForm.toolContentID}"
 					cancelButtonLabelKey="button.cancel"
Index: lams_tool_nb/web/defineLater.jsp
===================================================================
diff -u -r8b5940710ceac2c67320a1954dea1c58120c78b1 -re998cf2de8c4714022559cb5f67e61b677a2dd28
--- lams_tool_nb/web/defineLater.jsp	(.../defineLater.jsp)	(revision 8b5940710ceac2c67320a1954dea1c58120c78b1)
+++ lams_tool_nb/web/defineLater.jsp	(.../defineLater.jsp)	(revision e998cf2de8c4714022559cb5f67e61b677a2dd28)
@@ -1,7 +1,24 @@
+<!DOCTYPE html>
 <%@ include file="/includes/taglibs.jsp"%>
-<c:set var="title" scope="request">
-	<fmt:message key="activity.title" />
+<c:set var="lams">
+	<lams:LAMSURL />
 </c:set>
-<lams:Page type="learner" title="${title}">
+
+<lams:html>
+<lams:head>
+	<lams:css />
+	<title><fmt:message key="activity.title"/></title>
+	<script src="${lams}includes/javascript/jquery.js"></script>
+	<script src="${lams}includes/javascript/bootstrap.min.js" type="text/javascript"></script>
+</lams:head>
+
+<body class="stripes">
+
+	<c:set var="title" scope="request">
+	<fmt:message key="activity.title" />
+	</c:set>
+		<lams:Page type="learner" title="${title}">
 					<lams:DefineLater defineLaterMessageKey="message.defineLaterSet" />
-</lams:Page>
\ No newline at end of file
+	</lams:Page>
+	
+</lams:html>
Index: lams_tool_nb/web/learnerContent.jsp
===================================================================
diff -u -ra2d72bee6029b7e05e8cd696c02db214f3049365 -re998cf2de8c4714022559cb5f67e61b677a2dd28
--- lams_tool_nb/web/learnerContent.jsp	(.../learnerContent.jsp)	(revision a2d72bee6029b7e05e8cd696c02db214f3049365)
+++ lams_tool_nb/web/learnerContent.jsp	(.../learnerContent.jsp)	(revision e998cf2de8c4714022559cb5f67e61b677a2dd28)
@@ -34,9 +34,9 @@
 		<c:out value="${NbLearnerForm.basicContent}" escapeXml="false" />
 	</div>
 
-	<form:form action="/learner.do" modelAttribute="learnerForm" target="_self" onsubmit="disableFinishButton();" id="learnerForm">
-		<form:hidden property="toolSessionID" />
-		<form:hidden property="mode" />
+	<form:form action="starter/learner.do" modelAttribute="nbLearnerForm" target="_self" onsubmit="disableFinishButton();" id="nbLearnerForm">
+		<form:hidden path="toolSessionID" />
+		<form:hidden path="mode" />
 
 		<c:if test="${userFinished and reflectOnActivity}">
 			<div class="panel">
Index: lams_tool_nb/web/message.jsp
===================================================================
diff -u -ra2d72bee6029b7e05e8cd696c02db214f3049365 -re998cf2de8c4714022559cb5f67e61b677a2dd28
--- lams_tool_nb/web/message.jsp	(.../message.jsp)	(revision a2d72bee6029b7e05e8cd696c02db214f3049365)
+++ lams_tool_nb/web/message.jsp	(.../message.jsp)	(revision e998cf2de8c4714022559cb5f67e61b677a2dd28)
@@ -31,7 +31,7 @@
 	</c:if>
 	
 	<div class="align-right space-bottom-top">
-		<form:form modelAttribute="messageForm" action="/learner" target="_self" onsubmit="disableFinishButton();" id="messageForm">
+		<form:form modelAttribute="messageForm" action="/learner.do" target="_self" onsubmit="disableFinishButton();" id="messageForm">
 			<form:hidden path="toolSessionID" />
 			<form:hidden path="mode" />
 			<form:hidden path="method" value="finish"/>
Index: lams_tool_nb/web/monitoring/m_EditActivity.jsp
===================================================================
diff -u -ra2d72bee6029b7e05e8cd696c02db214f3049365 -re998cf2de8c4714022559cb5f67e61b677a2dd28
--- lams_tool_nb/web/monitoring/m_EditActivity.jsp	(.../m_EditActivity.jsp)	(revision a2d72bee6029b7e05e8cd696c02db214f3049365)
+++ lams_tool_nb/web/monitoring/m_EditActivity.jsp	(.../m_EditActivity.jsp)	(revision e998cf2de8c4714022559cb5f67e61b677a2dd28)
@@ -2,7 +2,7 @@
 
 <div class="voffset10">
 
-<c:if test="${formBean.totalLearners >= 1}">
+<c:if test="${NbMonitoringForm.totalLearners >= 1}">
 	<lams:Alert type="warn" id="no-edit" close="false">
 		<fmt:message key="message.alertContentEdit" />
 	</lams:Alert>
@@ -14,15 +14,15 @@
 			<fmt:message key="basic.title" />
 		</td>
 		<td>
-			<c:out value="${formBean.title}" escapeXml="true" />
+			<c:out value="${NbMonitoringForm.title}" escapeXml="true" />
 		</td>
 	</tr>
 	<tr>
 		<td class="field-name">
 			<fmt:message key="basic.content" />
 		</td>
 		<td>
-			<c:out value="${formBean.basicContent}" escapeXml="false" />
+			<c:out value="${NbMonitoringForm.basicContent}" escapeXml="false" />
 		</td>
 	</tr>
 </table>
Index: lams_tool_nb/web/monitoring/m_Statistics.jsp
===================================================================
diff -u -ra2d72bee6029b7e05e8cd696c02db214f3049365 -re998cf2de8c4714022559cb5f67e61b677a2dd28
--- lams_tool_nb/web/monitoring/m_Statistics.jsp	(.../m_Statistics.jsp)	(revision a2d72bee6029b7e05e8cd696c02db214f3049365)
+++ lams_tool_nb/web/monitoring/m_Statistics.jsp	(.../m_Statistics.jsp)	(revision e998cf2de8c4714022559cb5f67e61b677a2dd28)
@@ -8,14 +8,14 @@
 	<table class="table table-striped table-condensed">
 		<tr><td colspan="${allowComments ? 3 : 2}"><fmt:message key="heading.totalLearnersInGroup" /></td></tr>
 	
-		<c:forEach var="group" items="${formBean.groupStatsMap}">
+		<c:forEach var="group" items="${NbMonitoringForm.groupStatsMap}">
 			<tr><td width="40%"><c:out value="${group.key}" /></td> 
 				<td><c:out value="${group.value}" /></td>
 				<c:if test="${allowComments}">
 				<td width="20%">
 				<c:url value="monitoring.do" var="commentURL">
 					<c:param name="method" value="viewComments" />
-					<c:param name="toolSessionID" value="${formBean.sessionIdMap[group.key]}" />
+					<c:param name="toolSessionID" value="${NbMonitoringForm.sessionIdMap[group.key]}" />
 				</c:url>
 				<a href="javascript:launchPopup('${commentURL}')" class="btn btn-default btn-sm pull-right"><fmt:message key="label.view.comments" /></a></td>
 				</c:if>
@@ -27,14 +27,14 @@
 <table class="table table-striped table-condensed">
 	<tr>
 		<td width="40%"><fmt:message key="heading.totalLearners" /></td>
-		<td><c:out value="${formBean.totalLearners}" /></td>
+		<td><c:out value="${NbMonitoringForm.totalLearners}" /></td>
 		<c:if test="${allowComments && !isGroupedActivity}">
 			<c:forEach var="group" items="${formBean.sessionIdMap}">
 			<c:url value="monitoring.do" var="commentURL">
 					<c:param name="method" value="viewComments" />
 					<c:param name="toolSessionID" value="${group.value}" />
 			</c:url>
-			<td width="20%"><html:link href="javascript:launchPopup('${commentURL}')" styleClass="btn btn-default btn-sm pull-right"><fmt:message key="label.view.comments" /></html:link></td>
+			<td width="20%"><a href="javascript:launchPopup('${commentURL}')" styleClass="btn btn-default btn-sm pull-right"><fmt:message key="label.view.comments" /></a></td>
 			</c:forEach>
 		</c:if>
 	</tr>
Index: lams_tool_nb/web/monitoring/m_Summary.jsp
===================================================================
diff -u -ra2d72bee6029b7e05e8cd696c02db214f3049365 -re998cf2de8c4714022559cb5f67e61b677a2dd28
--- lams_tool_nb/web/monitoring/m_Summary.jsp	(.../m_Summary.jsp)	(revision a2d72bee6029b7e05e8cd696c02db214f3049365)
+++ lams_tool_nb/web/monitoring/m_Summary.jsp	(.../m_Summary.jsp)	(revision e998cf2de8c4714022559cb5f67e61b677a2dd28)
@@ -9,8 +9,8 @@
 </script>
 
 <div class="panel">
-	<h4><c:out value="${formBean.title}" escapeXml="true" /></h4>
-	<div class="voffset5"><c:out value="${formBean.basicContent}" escapeXml="false" /></div>
+	<h4><c:out value="${NbMonitoringForm.title}" escapeXml="true" /></h4>
+	<div class="voffset5"><c:out value="${NbMonitoringForm.basicContent}" escapeXml="false" /></div>
 </div>
 
 <H4><fmt:message key="titleHeading.statistics"/></H2>
Index: lams_tool_nb/web/monitoring/monitoring.jsp
===================================================================
diff -u -ra2d72bee6029b7e05e8cd696c02db214f3049365 -re998cf2de8c4714022559cb5f67e61b677a2dd28
--- lams_tool_nb/web/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision a2d72bee6029b7e05e8cd696c02db214f3049365)
+++ lams_tool_nb/web/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision e998cf2de8c4714022559cb5f67e61b677a2dd28)
@@ -33,11 +33,10 @@
 </lams:head>
 
 <body class="stripes" onLoad='init()'>
-	<form:form action="/monitoring.do" modelAttribute="" target="_self">
+	<form:form action="monitoring.do" modelAttribute="nbMonitoringForm" id="nbMonitoringForm" target="_self">
 
-		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" scope="request"/>
-		<html:hidden property="method" />
-		<html:hidden property="currentTab" styleId="currentTab" />
+		<form:hidden path="method"/>
+		<form:hidden path="currentTab" styleId="currentTab" />
 
 		<c:set var="monitoringURL">
 		<lams:WebAppURL/>monitoring.do
Index: lams_tool_nb/web/reflect.jsp
===================================================================
diff -u -ra2d72bee6029b7e05e8cd696c02db214f3049365 -re998cf2de8c4714022559cb5f67e61b677a2dd28
--- lams_tool_nb/web/reflect.jsp	(.../reflect.jsp)	(revision a2d72bee6029b7e05e8cd696c02db214f3049365)
+++ lams_tool_nb/web/reflect.jsp	(.../reflect.jsp)	(revision e998cf2de8c4714022559cb5f67e61b677a2dd28)
@@ -1,6 +1,20 @@
-<%@ page import="org.lamsfoundation.lams.tool.noticeboard.NoticeboardConstants"%>
+<!DOCTYPE html>
 <%@ include file="/includes/taglibs.jsp"%>
+<%@ page import="org.lamsfoundation.lams.tool.noticeboard.NoticeboardConstants"%>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
 
+<lams:html>
+<lams:head>
+	<lams:css />
+	<title><fmt:message key="activity.title"/></title>
+	<script src="${lams}includes/javascript/jquery.js"></script>
+	<script src="${lams}includes/javascript/bootstrap.min.js" type="text/javascript"></script>
+</lams:head>
+
+<body class="stripes">
+
 <script type="text/javascript">
 	function disableFinishButton() {
 		document.getElementById("finishButton").disabled = true;
@@ -13,7 +27,7 @@
 
 <lams:Page type="learner" title="${title}">
 
-	<form:form action="/learner" method="post" onsubmit="disableFinishButton();" modelAttribute="learnerForm" id="learnerForm">
+	<form:form action="/reflect.do" method="post" onsubmit="disableFinishButton();" modelAttribute="nbLearnerForm" id="nbLearnerForm">
 		<div class="form-group">
 			<div class="panel">
 				<lams:out value="${reflectInstructions}" escapeHtml="true" />
@@ -56,4 +70,5 @@
 		document.getElementById("focusedInput").focus();
 	}
 </script>
-
+	
+</lams:html>
Index: lams_tool_sbmt/web/common/taglibs.jsp
===================================================================
diff -u -r9d26aaf34391eb58df037978365deda31de85c1b -re998cf2de8c4714022559cb5f67e61b677a2dd28
--- lams_tool_sbmt/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 9d26aaf34391eb58df037978365deda31de85c1b)
+++ lams_tool_sbmt/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision e998cf2de8c4714022559cb5f67e61b677a2dd28)
@@ -7,5 +7,7 @@
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-xml" prefix="x" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 
 
+