Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/ClearSessionController.java
===================================================================
diff -u -ra5ee55c529ff5dbfb9e102604f7f253c141861ba -r51891afa31c2dcc90ef04fe7976d3fd1fea509f8
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/ClearSessionController.java	(.../ClearSessionController.java)	(revision a5ee55c529ff5dbfb9e102604f7f253c141861ba)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/ClearSessionController.java	(.../ClearSessionController.java)	(revision 51891afa31c2dcc90ef04fe7976d3fd1fea509f8)
@@ -36,6 +36,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.context.WebApplicationContext;
 
 /**
@@ -50,7 +51,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping("/clearsession")
+    @RequestMapping(value = "/clearsession", method = RequestMethod.POST)
     public void execute(HttpServletRequest request, HttpServletResponse response) throws IOException {
 	super.execute(request, response, applicationContext);
     }
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/LearningController.java
===================================================================
diff -u -rc0c1b666d8bd0a430f4b1e5f871232ab5d38f93b -r51891afa31c2dcc90ef04fe7976d3fd1fea509f8
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/LearningController.java	(.../LearningController.java)	(revision c0c1b666d8bd0a430f4b1e5f871232ab5d38f93b)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/LearningController.java	(.../LearningController.java)	(revision 51891afa31c2dcc90ef04fe7976d3fd1fea509f8)
@@ -50,6 +50,7 @@
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.context.WebApplicationContext;
 
 /**
@@ -70,7 +71,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping("")
+    @RequestMapping(value = "", method = RequestMethod.POST)
     public String unspecified(HttpServletRequest request) throws Exception {
 
 	// 'toolSessionID' and 'mode' paramters are expected to be present.
@@ -132,7 +133,7 @@
      *
      * @throws JSONException
      */
-    @RequestMapping("/becomeLeader")
+    @RequestMapping(value = "/becomeLeader", method = RequestMethod.POST)
     public String becomeLeader(HttpServletRequest request) throws IOException {
 	initService();
 	Long toolSessionId = new Long(request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID));
@@ -148,7 +149,7 @@
 	return null;
     }
 
-    @RequestMapping("/finishActivity")
+    @RequestMapping(value = "/finishActivity", method = RequestMethod.POST)
     public String finishActivity(HttpServletRequest request, HttpServletResponse response) {
 
 	Long toolSessionID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/MonitoringController.java
===================================================================
diff -u -ra5ee55c529ff5dbfb9e102604f7f253c141861ba -r51891afa31c2dcc90ef04fe7976d3fd1fea509f8
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision a5ee55c529ff5dbfb9e102604f7f253c141861ba)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 51891afa31c2dcc90ef04fe7976d3fd1fea509f8)
@@ -40,6 +40,7 @@
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 
 /**
  *
@@ -57,7 +58,7 @@
     @Qualifier("leaderselectionService")
     private ILeaderselectionService leaderselectionService;
 
-    @RequestMapping("")
+    @RequestMapping(value = "", method = RequestMethod.POST)
     public String unspecified(HttpServletRequest request) {
 
 	// initialize Session Map
@@ -98,7 +99,7 @@
     /**
      * Show leaders manage page
      */
-    @RequestMapping("/manageLeaders")
+    @RequestMapping(value = "/manageLeaders", method = RequestMethod.POST)
     public String manageLeaders(HttpServletRequest request) {
 	String sessionMapID = request.getParameter(LeaderselectionConstants.ATTR_SESSION_MAP_ID);
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
@@ -113,7 +114,7 @@
      * @throws IOException
      * @throws JSONException
      */
-    @RequestMapping("/saveLeaders")
+    @RequestMapping(value = "/saveLeaders", method = RequestMethod.POST)
     public String saveLeaders(HttpServletRequest request) throws IOException {
 	String sessionMapID = request.getParameter(LeaderselectionConstants.ATTR_SESSION_MAP_ID);
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/AuthoringController.java
===================================================================
diff -u -re1f494e2cf97728e4ae12e61620608cdc6c19ae3 -r51891afa31c2dcc90ef04fe7976d3fd1fea509f8
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision e1f494e2cf97728e4ae12e61620608cdc6c19ae3)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 51891afa31c2dcc90ef04fe7976d3fd1fea509f8)
@@ -50,6 +50,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.context.WebApplicationContext;
 
 /**
@@ -127,7 +128,7 @@
 	return "pages/authoring/authoring";
     }
 
-    @RequestMapping("/updateContent")
+    @RequestMapping(value= "/updateContent", method=RequestMethod.POST)
     public String updateContent(@ModelAttribute("authoringForm") AuthoringForm authoringForm, HttpServletRequest request) {
 	// TODO need error checking.
 
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/AuthoringNotebookConditionController.java
===================================================================
diff -u -r74280645f86d72ceabada5d340a174c4b10d9d53 -r51891afa31c2dcc90ef04fe7976d3fd1fea509f8
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/AuthoringNotebookConditionController.java	(.../AuthoringNotebookConditionController.java)	(revision 74280645f86d72ceabada5d340a174c4b10d9d53)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/AuthoringNotebookConditionController.java	(.../AuthoringNotebookConditionController.java)	(revision 51891afa31c2dcc90ef04fe7976d3fd1fea509f8)
@@ -76,7 +76,7 @@
      * @param request
      * @return
      */
-    @RequestMapping(value = "newConditionInit", method = RequestMethod.POST)
+    @RequestMapping(value = "newConditionInit")
     private String newConditionInit(@ModelAttribute NotebookConditionForm notebookConditionForm,
 	    HttpServletRequest request) {
 	String sessionMapID = WebUtil.readStrParam(request, NotebookConstants.ATTR_SESSION_MAP_ID);
@@ -94,7 +94,7 @@
      * @param response
      * @return
      */
-    @RequestMapping(value = "/editCondition", method = RequestMethod.POST)
+    @RequestMapping(value = "/editCondition")
     private String editCondition(NotebookConditionForm notebookConditionForm, HttpServletRequest request) {
 
 	String sessionMapID = notebookConditionForm.getSessionMapID();
@@ -166,7 +166,7 @@
      * @param response
      * @return
      */
-    @RequestMapping(value = "/removeCondition", method = RequestMethod.POST)
+    @RequestMapping(value = "/removeCondition")
     private String removeCondition(HttpServletRequest request) {
 
 	// get back sessionMAP
@@ -203,7 +203,7 @@
      * @param response
      * @return
      */
-    @RequestMapping(value = "/upCondition", method = RequestMethod.POST)
+    @RequestMapping(value = "/upCondition")
     private String upCondition(HttpServletRequest request) {
 	return switchItem(request, true);
     }
@@ -217,12 +217,12 @@
      * @param response
      * @return
      */
-    @RequestMapping(value = "/downCondition", method = RequestMethod.POST)
+    @RequestMapping(value = "/downCondition")
     private String downCondition(HttpServletRequest request) {
 	return switchItem(request, false);
     }
 
-    @RequestMapping(value = "/switchItem", method = RequestMethod.POST)
+    @RequestMapping(value = "/switchItem")
     private String switchItem(HttpServletRequest request, boolean up) {
 	// get back sessionMAP
 	String sessionMapID = WebUtil.readStrParam(request, NotebookConstants.ATTR_SESSION_MAP_ID);
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/ClearSessionController.java
===================================================================
diff -u -r74280645f86d72ceabada5d340a174c4b10d9d53 -r51891afa31c2dcc90ef04fe7976d3fd1fea509f8
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/ClearSessionController.java	(.../ClearSessionController.java)	(revision 74280645f86d72ceabada5d340a174c4b10d9d53)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/ClearSessionController.java	(.../ClearSessionController.java)	(revision 51891afa31c2dcc90ef04fe7976d3fd1fea509f8)
@@ -50,7 +50,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping(value = "/clearsession", method = RequestMethod.POST)
+    @RequestMapping(value = "/clearsession")
     public void execute(HttpServletRequest request, HttpServletResponse response) throws IOException {
 	super.execute(request, response, applicationContext);
     }
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/LearningController.java
===================================================================
diff -u -r74280645f86d72ceabada5d340a174c4b10d9d53 -r51891afa31c2dcc90ef04fe7976d3fd1fea509f8
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/LearningController.java	(.../LearningController.java)	(revision 74280645f86d72ceabada5d340a174c4b10d9d53)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/LearningController.java	(.../LearningController.java)	(revision 51891afa31c2dcc90ef04fe7976d3fd1fea509f8)
@@ -58,7 +58,6 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.context.WebApplicationContext;
 
 /**
@@ -85,7 +84,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping(value = "", method = RequestMethod.POST)
+    @RequestMapping(value = "")
     public String unspecified(@ModelAttribute("messageForm") LearningForm messageForm, HttpServletRequest request)
 	    throws Exception {
 
@@ -199,7 +198,7 @@
 	return notebookUser;
     }
 
-    @RequestMapping(value = "/finishActivity", method = RequestMethod.POST)
+    @RequestMapping(value = "/finishActivity")
     public String finishActivity(@ModelAttribute("messageForm") LearningForm messageForm, HttpServletRequest request,
 	    HttpServletResponse response) {
 
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/MonitoringController.java
===================================================================
diff -u -r74280645f86d72ceabada5d340a174c4b10d9d53 -r51891afa31c2dcc90ef04fe7976d3fd1fea509f8
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 74280645f86d72ceabada5d340a174c4b10d9d53)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 51891afa31c2dcc90ef04fe7976d3fd1fea509f8)
@@ -68,7 +68,7 @@
     @Qualifier("notebookMessageService")
     private MessageService messageService;
 
-    @RequestMapping(value = "", method = RequestMethod.POST)
+    @RequestMapping(value = "")
     public String unspecified(HttpServletRequest request) {
 
 	Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
@@ -103,7 +103,7 @@
 	return "pages/monitoring/monitoring";
     }
 
-    @RequestMapping(value = "/getUsers", method = RequestMethod.POST)
+    @RequestMapping(value = "/getUsers")
     public String getUsers(HttpServletRequest request, HttpServletResponse response) throws IOException {
 
 	Long toolSessionId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID));
@@ -226,7 +226,7 @@
      * @throws IOException
      */
 
-    @RequestMapping(value = "/setSubmissionDeadline", method = RequestMethod.POST)
+    @RequestMapping(value = "/setSubmissionDeadline")
     public String setSubmissionDeadline(HttpServletRequest request, HttpServletResponse response) throws IOException {
 
 	Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/PedagogicalPlannerController.java
===================================================================
diff -u -r74280645f86d72ceabada5d340a174c4b10d9d53 -r51891afa31c2dcc90ef04fe7976d3fd1fea509f8
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/PedagogicalPlannerController.java	(.../PedagogicalPlannerController.java)	(revision 74280645f86d72ceabada5d340a174c4b10d9d53)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/PedagogicalPlannerController.java	(.../PedagogicalPlannerController.java)	(revision 51891afa31c2dcc90ef04fe7976d3fd1fea509f8)
@@ -67,7 +67,7 @@
 	return initPedagogicalPlannerForm(pedagogicalPlannerForm, request);
     }
 
-    @RequestMapping(value = "/initPedagogicalPlannerForm", method = RequestMethod.POST)
+    @RequestMapping(value = "/initPedagogicalPlannerForm")
     public String initPedagogicalPlannerForm(NotebookPedagogicalPlannerForm pedagogicalPlannerForm,
 	    HttpServletRequest request) {
 	NotebookPedagogicalPlannerForm plannerForm = pedagogicalPlannerForm;
Index: lams_tool_notebook/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r36e474218e1201198ba926e57e56c7a885db1a9f -r51891afa31c2dcc90ef04fe7976d3fd1fea509f8
--- lams_tool_notebook/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 36e474218e1201198ba926e57e56c7a885db1a9f)
+++ lams_tool_notebook/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 51891afa31c2dcc90ef04fe7976d3fd1fea509f8)
@@ -34,7 +34,6 @@
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
 
 <c:set var="class" value=""/>
 <c:if test="${id == 1}">
Index: lams_tool_notebook/web/WEB-INF/tags/TabBodyArea.tag
===================================================================
diff -u -ra0a249e0861e944d080689e4ebb853566cd40f2d -r51891afa31c2dcc90ef04fe7976d3fd1fea509f8
--- lams_tool_notebook/web/WEB-INF/tags/TabBodyArea.tag	(.../TabBodyArea.tag)	(revision a0a249e0861e944d080689e4ebb853566cd40f2d)
+++ lams_tool_notebook/web/WEB-INF/tags/TabBodyArea.tag	(.../TabBodyArea.tag)	(revision 51891afa31c2dcc90ef04fe7976d3fd1fea509f8)
@@ -30,7 +30,6 @@
 
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
 
 <div class="panel-body panel-monitor-body">
 	 <jsp:doBody />
Index: lams_tool_notebook/web/common/messages.jsp
===================================================================
diff -u -rc05d26819a155980f333e1a4aea16afe974119e3 -r51891afa31c2dcc90ef04fe7976d3fd1fea509f8
--- lams_tool_notebook/web/common/messages.jsp	(.../messages.jsp)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
+++ lams_tool_notebook/web/common/messages.jsp	(.../messages.jsp)	(revision 51891afa31c2dcc90ef04fe7976d3fd1fea509f8)
@@ -3,7 +3,7 @@
 <c:if test="${not empty errorMap and not empty errorMap[errorKey]}"> 
     <lams:Alert id="error" type="danger" close="false"> 
         <c:forEach var="error" items="${errorMap[errorKey]}"> 
-            <c:out value="${error}" /> 
+            <c:out value="${error}" /><br /> 
         </c:forEach> 
     </lams:Alert> 
 </c:if>
\ No newline at end of file
Index: lams_tool_notebook/web/common/taglibs.jsp
===================================================================
diff -u -r749b841adf6115016059d15ddfa58aee5b11e26d -r51891afa31c2dcc90ef04fe7976d3fd1fea509f8
--- lams_tool_notebook/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 749b841adf6115016059d15ddfa58aee5b11e26d)
+++ lams_tool_notebook/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 51891afa31c2dcc90ef04fe7976d3fd1fea509f8)
@@ -1,5 +1,4 @@
 <%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
Index: lams_tool_notebook/web/pages/authoring/authoring.jsp
===================================================================
diff -u -rcec2df99f0434302608306f07fe5f48c09546ff9 -r51891afa31c2dcc90ef04fe7976d3fd1fea509f8
--- lams_tool_notebook/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision cec2df99f0434302608306f07fe5f48c09546ff9)
+++ lams_tool_notebook/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 51891afa31c2dcc90ef04fe7976d3fd1fea509f8)
@@ -14,7 +14,7 @@
 	
 			<form:hidden path="sessionMapID" />
 	
-		<lams:Page title="${title}" type="navbar"formID="authoringForm">
+		<lams:Page title="${title}" type="navbar" formID="authoringForm">
 
 		<lams:Tabs control="true" title="${title}" helpToolSignature="<%= NotebookConstants.TOOL_SIGNATURE %>" helpModule="authoring">
 			<lams:Tab id="1" key="button.basic" />
Index: lams_tool_notebook/web/pages/learning/notebook.jsp
===================================================================
diff -u -rc05d26819a155980f333e1a4aea16afe974119e3 -r51891afa31c2dcc90ef04fe7976d3fd1fea509f8
--- lams_tool_notebook/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
+++ lams_tool_notebook/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 51891afa31c2dcc90ef04fe7976d3fd1fea509f8)
@@ -20,7 +20,7 @@
 			CKEDITOR.instances["entryText"].focus();
 		</c:when>		
 		<c:otherwise>
-			document.forms.learningForm.focusedInput.focus();
+			document.forms.messageForm.focusedInput.focus();
 		</c:otherwise>
 		</c:choose>
 		document.getElementById("finishButton").style.visibility = 'visible';
@@ -50,13 +50,13 @@
 			}
 		</c:when>		
 		<c:otherwise>
-			if (forceResponse =="true" && document.forms.learningForm.focusedInput.value == "") {
+			if (forceResponse =="true" && document.forms.messageForm.focusedInput.value == "") {
 
 				retValue = confirm("<fmt:message>message.learner.blank.alertforceResponse</fmt:message>");
 				textAreaReady();
 				return retValue;
 				
-			} else if  (forceResponse =="false" && document.forms.learningForm.focusedInput.value == "" && mode == "learner") {
+			} else if  (forceResponse =="false" && document.forms.messageForm.focusedInput.value == "" && mode == "learner") {
 	
 				if (!confirm("<fmt:message>message.learner.blank.input</fmt:message>")) {
 					// otherwise, focus on the text area
Index: lams_tool_notebook/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -rc05d26819a155980f333e1a4aea16afe974119e3 -r51891afa31c2dcc90ef04fe7976d3fd1fea509f8
--- lams_tool_notebook/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
+++ lams_tool_notebook/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 51891afa31c2dcc90ef04fe7976d3fd1fea509f8)
@@ -31,7 +31,7 @@
 	</lams:head>
 	<body class="stripes">
 		<script type="text/javascript">
-			var statisticsURL = "<c:url value='/monitoring/getStatistics.do?toolContentID=${notebookDTO.toolContentId}&reqID=";
+		var statisticsURL = "<c:url value='/monitoring/getStatistics.do' />?toolContentID="+${notebookDTO.toolContentId}+"&reqID=";
 		</script>
 
 		<c:set var="title"><fmt:message key="activity.title" /></c:set>
@@ -42,7 +42,6 @@
 				<lams:Tab id="2" key="button.editActivity" />
 				<lams:Tab id="3" key="button.statistics" />
 			</lams:Tabs>
-
 			<lams:TabBodyArea>
 				<lams:TabBodys>
 					<lams:TabBody id="1" titleKey="button.summary" page="summary.jsp" />
Index: lams_tool_notebook/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rc05d26819a155980f333e1a4aea16afe974119e3 -r51891afa31c2dcc90ef04fe7976d3fd1fea509f8
--- lams_tool_notebook/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
+++ lams_tool_notebook/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 51891afa31c2dcc90ef04fe7976d3fd1fea509f8)
@@ -2,8 +2,8 @@
 <c:set scope="request" var="lams"><lams:LAMSURL/></c:set>
 <c:set scope="request" var="tool"><lams:WebAppURL/></c:set>
 
-<link type="text/css" href="${lams}css/jquery-ui-smoothness-theme.css" rel="stylesheet">
-<link type="text/css" href="${lams}/css/jquery-ui.timepicker.css" rel="stylesheet">
+<link type="text/css" href="${lams}css/jquery-ui-smoothness-theme.css" rel="stylesheet"/>
+<link type="text/css" href="${lams}/css/jquery-ui.timepicker.css" rel="stylesheet"/>
 <link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet"/>
 
 <style media="screen,projection" type="text/css">
@@ -43,7 +43,7 @@
 			
 			jQuery("#group${sessionId}").jqGrid({
 			
-				url: "<c:url value='/monitoring/getUsersdo?toolSessionID=${sessionId}'",
+				url: "<c:url value='/monitoring/getUsers.do?toolSessionID=${sessionId}'/>",
 				datatype: 'json',
 				jsonReader : {
 				     root: "rows",
@@ -118,7 +118,7 @@
  					}).text(comment).appendTo(subgrid); 
   					
  					$(".editable${sessionId}_" + rowId + "_t").jinplace({
- 					    url: "<c:url value='/monitoring/saveTeacherComment.do?userUid= + ${userUid}' />"
+ 					    url: "<c:url value='/monitoring/saveTeacherComment.do?userUid= + ${userUid}' />",
  					    textOnly: true,
  					    placeholder: '<fmt:message key="label.click.to.edit" />',
  					    okButton: "<fmt:message key='button.ok' />",
@@ -201,47 +201,47 @@
 	    <c:out value="${notebookDTO.instructions}" escapeXml="false"/>
 	</div>
 	
-	<c:if test="${empty notebookDTO.sessions}">
-		<lams:Alert type="info" id="no-session-summary" close="false">
-			<fmt:message key="message.monitoring.summary.no.session" />
-		</lams:Alert>
+		<c:if test="${empty notebookDTO.sessions}">
+			<lams:Alert type="info" id="no-session-summary" close="false">
+				<fmt:message key="message.monitoring.summary.no.session" />
+			</lams:Alert>
+		</c:if>
+		
+	</div>
+	 
+	<c:if test="${isGroupedActivity}">
+		<div class="panel-group" id="accordionSessions" role="tablist" aria-multiselectable="true"> 
 	</c:if>
-	
-</div>
- 
-<c:if test="${isGroupedActivity}">
-	<div class="panel-group" id="accordionSessions" role="tablist" aria-multiselectable="true"> 
-</c:if>
 
-<c:forEach var="session" items="${notebookDTO.sessions}" varStatus="status">
+	<c:forEach var="session" items="${notebookDTO.sessions}" varStatus="status">
 
-	<c:if test="${isGroupedActivity}">	
-	    <div class="panel panel-default" >
-        <div class="panel-heading" id="heading${session.key}">
-        	<span class="panel-title collapsable-icon-left">
-        	<a class="${status.first ? '' : 'collapsed'}" role="button" data-toggle="collapse" href="#collapse${session.key}" 
-					aria-expanded="${status.first ? 'false' : 'true'}" aria-controls="collapse${session.key}" >
-			<fmt:message key="message.session.name" />:	<c:out value="${session.value}" /></a>
-			</span>
-        </div>
-        
-        <div id="collapse${session.key}" class="panel-collapse collapse ${status.first ? 'in' : ''}"
-        	 role="tabpanel" aria-labelledby="heading${session.key}">
-	</c:if>
+		<c:if test="${isGroupedActivity}">	
+		    <div class="panel panel-default" >
+		        <div class="panel-heading" id="heading${session.key}">
+		        	<span class="panel-title collapsable-icon-left">
+		        	<a class="${status.first ? '' : 'collapsed'}" role="button" data-toggle="collapse" href="#collapse${session.key}" 
+							aria-expanded="${status.first ? 'false' : 'true'}" aria-controls="collapse${session.key}" >
+					<fmt:message key="message.session.name" />:	<c:out value="${session.value}" /></a>
+					</span>
+		        </div>
+	        
+	       		<div id="collapse${session.key}" class="panel-collapse collapse ${status.first ? 'in' : ''}"
+	        	 role="tabpanel" aria-labelledby="heading${session.key}">
+		</c:if>
+	 
+	 	<table id="group${session.key}" class="scroll" cellpadding="0" cellspacing="0" ></table>
+		<div id="group${session.key}pager"></div>
  
- 	<table id="group${session.key}" class="scroll" cellpadding="0" cellspacing="0" ></table>
-	<div id="group${session.key}pager"></div>
- 
-	<c:if test="${isGroupedActivity}">
-		</div> <!-- end collapse area  -->
-		</div> <!-- end collapse panel  -->
-	</c:if>
+		<c:if test="${isGroupedActivity}">
+			</div> <!-- end collapse area  -->
+			</div> <!-- end collapse panel  -->
+		</c:if>
 	${ !isGroupedActivity || ! status.last ? '<div class="voffset5">&nbsp;</div>' :  ''}
-</c:forEach>
+	</c:forEach>
 	
-<c:if test="${isGroupedActivity}">
-	</div> <!--  end panel group -->
-</c:if> 
+	<c:if test="${isGroupedActivity}">
+		</div> <!--  end panel group -->
+	</c:if> 
 
 <%@include file="advanceOptions.jsp"%>
 
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringConditionController.java
===================================================================
diff -u -rcec2df99f0434302608306f07fe5f48c09546ff9 -r51891afa31c2dcc90ef04fe7976d3fd1fea509f8
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringConditionController.java	(.../AuthoringConditionController.java)	(revision cec2df99f0434302608306f07fe5f48c09546ff9)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringConditionController.java	(.../AuthoringConditionController.java)	(revision 51891afa31c2dcc90ef04fe7976d3fd1fea509f8)
@@ -81,7 +81,7 @@
      * @return
      */
 
-    @RequestMapping(value = "/newConditionInit", method = RequestMethod.POST)
+    @RequestMapping(value = "/newConditionInit")
     public String newConditionInit(HttpServletRequest request) {
 
 	SurveyConditionForm surveyConditionForm = new SurveyConditionForm();
@@ -100,7 +100,7 @@
      * @param request
      * @return
      */
-    @RequestMapping(value = "/editCondition", method = RequestMethod.POST)
+    @RequestMapping(value = "/editCondition")
     public String editCondition(SurveyConditionForm surveyConditionForm, HttpServletRequest request) {
 
 	String sessionMapID = surveyConditionForm.getSessionMapID();
@@ -173,7 +173,7 @@
      * @param response
      * @return
      */
-    @RequestMapping(value = "/removeCondition", method = RequestMethod.POST)
+    @RequestMapping(value = "/removeCondition")
     public String removeCondition(HttpServletRequest request) {
 
 	// get back sessionMAP
@@ -210,7 +210,7 @@
      * @param response
      * @return
      */
-    @RequestMapping(value = "/upCondition", method = RequestMethod.POST)
+    @RequestMapping(value = "/upCondition")
     private String upCondition(HttpServletRequest request) {
 	return switchItem(request, true);
     }
@@ -224,12 +224,12 @@
      * @param response
      * @return
      */
-    @RequestMapping(value = "/downCondition", method = RequestMethod.POST)
+    @RequestMapping(value = "/downCondition")
     private String downCondition(HttpServletRequest request) {
 	return switchItem(request, false);
     }
 
-    @RequestMapping(value = "/switchItem", method = RequestMethod.POST)
+    @RequestMapping(value = "/switchItem")
     public String switchItem(HttpServletRequest request, boolean up) {
 	// get back sessionMAP
 	String sessionMapID = WebUtil.readStrParam(request, SurveyConstants.ATTR_SESSION_MAP_ID);
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringController.java
===================================================================
diff -u -rcec2df99f0434302608306f07fe5f48c09546ff9 -r51891afa31c2dcc90ef04fe7976d3fd1fea509f8
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision cec2df99f0434302608306f07fe5f48c09546ff9)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 51891afa31c2dcc90ef04fe7976d3fd1fea509f8)
@@ -106,7 +106,7 @@
      * @param response
      * @return
      */
-    @RequestMapping(value = "/removeItem", method = RequestMethod.POST)
+    @RequestMapping(value = "/removeItem")
     public String removeItem(HttpServletRequest request) {
 
 	// get back sessionMAP
@@ -150,7 +150,7 @@
      * @param response
      * @return
      */
-    @RequestMapping(value = "/upItem", method = RequestMethod.POST)
+    @RequestMapping(value = "/upItem")
     public String upItem(HttpServletRequest request) {
 
 	return switchItem(request, true);
@@ -165,13 +165,13 @@
      * @param response
      * @return
      */
-    @RequestMapping(value = "/downItem", method = RequestMethod.POST)
+    @RequestMapping(value = "/downItem")
     public String downItem(HttpServletRequest request) {
 
 	return switchItem(request, false);
     }
 
-    @RequestMapping(value = "/switchItem", method = RequestMethod.POST)
+    @RequestMapping(value = "/switchItem")
     public String switchItem(HttpServletRequest request, boolean up) {
 	// get back sessionMAP
 	String sessionMapID = WebUtil.readStrParam(request, SurveyConstants.ATTR_SESSION_MAP_ID);
@@ -212,7 +212,7 @@
      * @param response
      * @return
      */
-    @RequestMapping(value = "/editItemInit", method = RequestMethod.POST)
+    @RequestMapping(value = "/editItemInit")
     public String editItemInit(QuestionForm surveyItemForm, HttpServletRequest request) {
 
 	// get back sessionMAP
@@ -247,7 +247,7 @@
      * @param response
      * @return
      */
-    @RequestMapping(value = "/newItemInit", method = RequestMethod.POST)
+    @RequestMapping(value = "/newItemInit")
     public String newItemlInit(@ModelAttribute("surveyItemForm") QuestionForm surveyItemForm,
 	    HttpServletRequest request) {
 
@@ -266,7 +266,7 @@
     /**
      * Create a new question based on existing one.
      */
-    @RequestMapping(value = "/copyItemInit", method = RequestMethod.POST)
+    @RequestMapping(value = "/copyItemInit")
     public String copyItemlInit(QuestionForm surveyItemForm, HttpServletRequest request) {
 	String sessionMapID = WebUtil.readStrParam(request, SurveyConstants.ATTR_SESSION_MAP_ID);
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
@@ -345,7 +345,7 @@
      * @throws ServletException
      *
      */
-    @RequestMapping(value = "/start", method = RequestMethod.POST)
+    @RequestMapping(value = "/start")
     public String start(SurveyForm startForm, HttpServletRequest request) throws Exception {
 
 	ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request);
@@ -420,7 +420,7 @@
 	return "pages/authoring/start";
     }
 
-    @RequestMapping(value = "/definelater", method = RequestMethod.POST)
+    @RequestMapping(value = "/definelater")
     public String definelater(SurveyForm startForm, HttpServletRequest request) throws Exception {
 
 	// update define later flag to true
@@ -523,7 +523,7 @@
      * @return
      * @throws ServletException
      */
-    @RequestMapping(value = "/init", method = RequestMethod.POST)
+    @RequestMapping(value = "/init")
     public String initPage(SurveyForm startForm, HttpServletRequest request) throws ServletException {
 	String sessionMapID = WebUtil.readStrParam(request, SurveyConstants.ATTR_SESSION_MAP_ID);
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
@@ -886,7 +886,7 @@
      * @param response
      * @return
      */
-    @RequestMapping(value = "/newInstruction", method = RequestMethod.POST)
+    @RequestMapping(value = "/newInstruction")
     public String newInstruction(HttpServletRequest request) {
 	int count = NumberUtils.stringToInt(request.getParameter(AuthoringController.INSTRUCTION_ITEM_COUNT), 0);
 	List instructionList = new ArrayList(++count);
@@ -911,7 +911,7 @@
      * @param response
      * @return
      */
-    @RequestMapping(value = "/removeInstruction", method = RequestMethod.POST)
+    @RequestMapping(value = "/removeInstruction")
     public String removeInstruction(HttpServletRequest request) {
 	int count = NumberUtils.stringToInt(request.getParameter(AuthoringController.INSTRUCTION_ITEM_COUNT), 0);
 	int removeIdx = NumberUtils.stringToInt(request.getParameter("removeIdx"), -1);
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/LearningController.java
===================================================================
diff -u -rcec2df99f0434302608306f07fe5f48c09546ff9 -r51891afa31c2dcc90ef04fe7976d3fd1fea509f8
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/LearningController.java	(.../LearningController.java)	(revision cec2df99f0434302608306f07fe5f48c09546ff9)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/LearningController.java	(.../LearningController.java)	(revision 51891afa31c2dcc90ef04fe7976d3fd1fea509f8)
@@ -111,7 +111,7 @@
      * This method will avoid read database again and lost un-saved resouce item lost when user "refresh page",
      *
      */
-    @RequestMapping(value = "/start", method = RequestMethod.POST)
+    @RequestMapping(value = "/start")
     private String start(AnswerForm surveyForm, HttpServletRequest request) {
 
 	// initial Session Map
@@ -243,7 +243,7 @@
 	}
     }
 
-    @RequestMapping(value = "/nextQuestion", method = RequestMethod.POST)
+    @RequestMapping(value = "/nextQuestion")
     private String nextQuestion(@ModelAttribute("surveyForm") AnswerForm surveyForm,
 	    MultiValueMap<String, String> errorMap, HttpServletRequest request) {
 	Integer questionSeqID = surveyForm.getQuestionSeqID();
@@ -286,7 +286,7 @@
 	return "pages/learning/learning";
     }
 
-    @RequestMapping(value = "/previousQuestion", method = RequestMethod.POST)
+    @RequestMapping(value = "/previousQuestion")
     private String previousQuestion(@ModelAttribute("surveyForm") AnswerForm surveyForm,
 	    MultiValueMap<String, String> errorMap, HttpServletRequest request) {
 	Integer questionSeqID = surveyForm.getQuestionSeqID();
@@ -322,7 +322,7 @@
 	return "pages/learning/learning";
     }
 
-    @RequestMapping(value = "/retake", method = RequestMethod.POST)
+    @RequestMapping(value = "/retake")
     private String retake(AnswerForm surveyForm, HttpServletRequest request, HttpServletResponse response) {
 	Integer questionSeqID = surveyForm.getQuestionSeqID();
 
@@ -354,7 +354,7 @@
 	return "pages/learning/learning";
     }
 
-    @RequestMapping(value = "/showOtherUsersAnswers", method = RequestMethod.POST)
+    @RequestMapping(value = "/showOtherUsersAnswers")
     private String showOtherUsersAnswers(HttpServletRequest request) {
 	String sessionMapID = request.getParameter("sessionMapID");
 	request.setAttribute("sessionMapID", sessionMapID);
@@ -384,7 +384,7 @@
      * Get OpenResponses.
      */
 
-    @RequestMapping(value = "/getOpenResponses", method = RequestMethod.POST)
+    @RequestMapping(value = "/getOpenResponses")
     private String getOpenResponses(HttpServletRequest request, HttpServletResponse res)
 	    throws IOException, ServletException {
 
@@ -484,7 +484,7 @@
      * @param response
      * @return
      */
-    @RequestMapping(value = "/finish", method = RequestMethod.POST)
+    @RequestMapping(value = "/finish")
     private String finish(HttpServletRequest request) {
 
 	// get back SessionMap
@@ -520,7 +520,7 @@
      * @param response
      * @return
      */
-    @RequestMapping(value = "/newReflection", method = RequestMethod.POST)
+    @RequestMapping(value = "/newReflection")
     private String newReflection(@ModelAttribute("messageForm") ReflectionForm messageForm,
 	    HttpServletRequest request) {
 
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/MonitoringController.java
===================================================================
diff -u -rcec2df99f0434302608306f07fe5f48c09546ff9 -r51891afa31c2dcc90ef04fe7976d3fd1fea509f8
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision cec2df99f0434302608306f07fe5f48c09546ff9)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 51891afa31c2dcc90ef04fe7976d3fd1fea509f8)
@@ -69,7 +69,6 @@
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.util.HtmlUtils;
 
 import com.fasterxml.jackson.databind.node.ArrayNode;
@@ -108,7 +107,7 @@
      * @return
      */
 
-    @RequestMapping(value = "/summary", method = RequestMethod.POST)
+    @RequestMapping(value = "/summary")
     private String summary(HttpServletRequest request) {
 
 	// get session from shared session.
@@ -161,7 +160,7 @@
 	return "pages/monitoring/monitoring";
     }
 
-    @RequestMapping(value = "/listAnswers", method = RequestMethod.POST)
+    @RequestMapping(value = "/listAnswers")
     private String listAnswers(HttpServletRequest request) {
 	Long sessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
 	Long questionUid = WebUtil.readLongParam(request, SurveyConstants.ATTR_QUESTION_UID);
@@ -173,7 +172,7 @@
 	return "pages/monitoring/listanswers";
     }
 
-    @RequestMapping(value = "/getAnswersJSON", method = RequestMethod.POST)
+    @RequestMapping(value = "/getAnswersJSON")
     private String getAnswersJSON(HttpServletRequest request, HttpServletResponse response) throws IOException {
 
 	Long sessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
@@ -241,7 +240,7 @@
 	return null;
     }
 
-    @RequestMapping(value = "/listReflections", method = RequestMethod.POST)
+    @RequestMapping(value = "/listReflections")
     private String listReflections(HttpServletRequest request) {
 
 	Long sessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
@@ -252,7 +251,7 @@
 	return "pages/monitoring/listreflections";
     }
 
-    @RequestMapping(value = "/getReflectionsJSON", method = RequestMethod.POST)
+    @RequestMapping(value = "/getReflectionsJSON")
     private String getReflectionsJSON(HttpServletRequest request, HttpServletResponse response) throws IOException {
 
 	Long sessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
@@ -312,7 +311,7 @@
      * @return
      */
 
-    @RequestMapping(value = "/exportSurvey", method = RequestMethod.POST)
+    @RequestMapping(value = "/exportSurvey")
     private String exportSurvey(HttpServletRequest request, HttpServletResponse response) {
 	Long toolSessionID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID));
 
@@ -523,7 +522,7 @@
      * @throws IOException
      */
 
-    @RequestMapping(value = "/setSubmissionDeadline", method = RequestMethod.POST)
+    @RequestMapping(value = "/setSubmissionDeadline")
     public String setSubmissionDeadline(HttpServletRequest request, HttpServletResponse response) throws IOException {
 
 	Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
Index: lams_tool_survey/web/common/messages.jsp
===================================================================
diff -u -re5f2fd4e04a38d5ad88706043b99ea79d32da0e1 -r51891afa31c2dcc90ef04fe7976d3fd1fea509f8
--- lams_tool_survey/web/common/messages.jsp	(.../messages.jsp)	(revision e5f2fd4e04a38d5ad88706043b99ea79d32da0e1)
+++ lams_tool_survey/web/common/messages.jsp	(.../messages.jsp)	(revision 51891afa31c2dcc90ef04fe7976d3fd1fea509f8)
@@ -3,7 +3,7 @@
  <c:if test="${not empty errorMap and not empty errorMap[errorKey]}"> 
      <lams:Alert id="error" type="danger" close="false"> 
          <c:forEach var="error" items="${errorMap[errorKey]}"> 
-             <c:out value="${error}" /> 
+             <c:out value="${error}" /><br /> 
          </c:forEach> 
      </lams:Alert> 
 </c:if>
\ No newline at end of file
Index: lams_tool_survey/web/pages/learning/question.jsp
===================================================================
diff -u -r3b3d4284d5320270195dfa1f4980c4bd21e0fea0 -r51891afa31c2dcc90ef04fe7976d3fd1fea509f8
--- lams_tool_survey/web/pages/learning/question.jsp	(.../question.jsp)	(revision 3b3d4284d5320270195dfa1f4980c4bd21e0fea0)
+++ lams_tool_survey/web/pages/learning/question.jsp	(.../question.jsp)	(revision 51891afa31c2dcc90ef04fe7976d3fd1fea509f8)
@@ -11,7 +11,7 @@
 		<c:if test="${not empty errorMap and not empty errorMap[errorKey]}">
 			<lams:Alert id="error" type="danger" close="false">
                 <c:forEach var="error" items="${errorMap[errorKey]}"> 
-                    <c:out value="${error}" />
+                    <c:out value="${error}" /><br />
                 </c:forEach>
 					
 			</lams:Alert>