Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/AuthoringController.java
===================================================================
diff -u -ra5ee55c529ff5dbfb9e102604f7f253c141861ba -r6f0463297ec65a9796cf79da577b4c0280ddfd5e
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision a5ee55c529ff5dbfb9e102604f7f253c141861ba)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 6f0463297ec65a9796cf79da577b4c0280ddfd5e)
@@ -43,14 +43,15 @@
 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;
 
 /**
  *
  *
  *
  */
 @Controller
-@RequestMapping("/authoring")
+//@RequestMapping("")
 public class AuthoringController {
 
     private static Logger logger = Logger.getLogger(AuthoringController.class);
@@ -69,7 +70,7 @@
      * <code>toolContentID</code> will be passed in. This will be used to retrieve content for this tool.
      *
      */
-    @RequestMapping("")
+    @RequestMapping("/authoring")
     protected String unspecified(AuthoringForm authoringForm, HttpServletRequest request) {
 
 	// Extract toolContentID from parameters.
@@ -114,10 +115,10 @@
 	request.getSession().setAttribute(map.getSessionID(), map);
 	request.setAttribute(LeaderselectionConstants.ATTR_SESSION_MAP, map);
 
-	return "pages/authoring";
+	return "pages/authoring/authoring";
     }
 
-    @RequestMapping("/updateContent")
+    @RequestMapping(value = "/updateContent", method = RequestMethod.POST)
     public String updateContent(@ModelAttribute("authoringForm") AuthoringForm authoringForm,
 	    HttpServletRequest request, HttpServletResponse response) {
 	// TODO need error checking.
@@ -151,6 +152,6 @@
 	request.setAttribute(LeaderselectionConstants.ATTR_SESSION_MAP, map);
 	request.setAttribute("authoringForm", authoringForm);
 
-	return "pages/authoring";
+	return "pages/authoring/authoring";
     }
 }
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/ClearSessionController.java
===================================================================
diff -u -r51891afa31c2dcc90ef04fe7976d3fd1fea509f8 -r6f0463297ec65a9796cf79da577b4c0280ddfd5e
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/ClearSessionController.java	(.../ClearSessionController.java)	(revision 51891afa31c2dcc90ef04fe7976d3fd1fea509f8)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/ClearSessionController.java	(.../ClearSessionController.java)	(revision 6f0463297ec65a9796cf79da577b4c0280ddfd5e)
@@ -21,7 +21,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.tool.leaderselection.web.controller;
 
 import java.io.IOException;
@@ -30,13 +29,11 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
 import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishController;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 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;
 
 /**
@@ -46,12 +43,12 @@
  *
  */
 @Controller
-public class ClearSessionController extends LamsAuthoringFinishController{
+public class ClearSessionController extends LamsAuthoringFinishController {
 
     @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_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/LearningController.java
===================================================================
diff -u -r51891afa31c2dcc90ef04fe7976d3fd1fea509f8 -r6f0463297ec65a9796cf79da577b4c0280ddfd5e
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/LearningController.java	(.../LearningController.java)	(revision 51891afa31c2dcc90ef04fe7976d3fd1fea509f8)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/LearningController.java	(.../LearningController.java)	(revision 6f0463297ec65a9796cf79da577b4c0280ddfd5e)
@@ -50,7 +50,6 @@
 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;
 
 /**
@@ -71,13 +70,12 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping(value = "", method = RequestMethod.POST)
+    @RequestMapping(value = "")
     public String unspecified(HttpServletRequest request) throws Exception {
 
 	// 'toolSessionID' and 'mode' paramters are expected to be present.
 	ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, false);
 	// set up service
-	initService();
 
 	// Retrieve the session and content.
 	Long toolSessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
@@ -133,9 +131,8 @@
      *
      * @throws JSONException
      */
-    @RequestMapping(value = "/becomeLeader", method = RequestMethod.POST)
+    @RequestMapping(value = "/becomeLeader")
     public String becomeLeader(HttpServletRequest request) throws IOException {
-	initService();
 	Long toolSessionId = new Long(request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID));
 	LeaderselectionSession session = leaderselectionService.getSessionBySessionId(toolSessionId);
 
@@ -149,7 +146,7 @@
 	return null;
     }
 
-    @RequestMapping(value = "/finishActivity", method = RequestMethod.POST)
+    @RequestMapping(value = "/finishActivity")
     public String finishActivity(HttpServletRequest request, HttpServletResponse response) {
 
 	Long toolSessionID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
@@ -182,13 +179,6 @@
 	return null;
     }
 
-    private void initService() {
-	if (leaderselectionService == null) {
-	    leaderselectionService = LeaderselectionServiceProxy
-		    .getLeaderselectionService(this.applicationContext.getServletContext());
-	}
-    }
-
     private LeaderselectionUser getCurrentUser(Long toolSessionId) {
 	UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
 
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/LearningWebsocketServer.java
===================================================================
diff -u -ra5ee55c529ff5dbfb9e102604f7f253c141861ba -r6f0463297ec65a9796cf79da577b4c0280ddfd5e
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/LearningWebsocketServer.java	(.../LearningWebsocketServer.java)	(revision a5ee55c529ff5dbfb9e102604f7f253c141861ba)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/LearningWebsocketServer.java	(.../LearningWebsocketServer.java)	(revision 6f0463297ec65a9796cf79da577b4c0280ddfd5e)
@@ -15,8 +15,6 @@
 import javax.websocket.server.ServerEndpoint;
 
 import org.apache.log4j.Logger;
-
-
 import org.lamsfoundation.lams.tool.leaderselection.service.ILeaderselectionService;
 import org.lamsfoundation.lams.tool.leaderselection.service.LeaderselectionServiceProxy;
 import org.lamsfoundation.lams.util.hibernate.HibernateSessionManager;
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/MonitoringController.java
===================================================================
diff -u -r51891afa31c2dcc90ef04fe7976d3fd1fea509f8 -r6f0463297ec65a9796cf79da577b4c0280ddfd5e
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 51891afa31c2dcc90ef04fe7976d3fd1fea509f8)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 6f0463297ec65a9796cf79da577b4c0280ddfd5e)
@@ -40,7 +40,6 @@
 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;
 
 /**
  *
@@ -58,7 +57,7 @@
     @Qualifier("leaderselectionService")
     private ILeaderselectionService leaderselectionService;
 
-    @RequestMapping(value = "", method = RequestMethod.POST)
+    @RequestMapping(value = "")
     public String unspecified(HttpServletRequest request) {
 
 	// initialize Session Map
@@ -99,7 +98,7 @@
     /**
      * Show leaders manage page
      */
-    @RequestMapping(value = "/manageLeaders", method = RequestMethod.POST)
+    @RequestMapping(value = "/manageLeaders")
     public String manageLeaders(HttpServletRequest request) {
 	String sessionMapID = request.getParameter(LeaderselectionConstants.ATTR_SESSION_MAP_ID);
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
@@ -114,7 +113,7 @@
      * @throws IOException
      * @throws JSONException
      */
-    @RequestMapping(value = "/saveLeaders", method = RequestMethod.POST)
+    @RequestMapping(value = "/saveLeaders")
     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_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/TblMonitoringController.java
===================================================================
diff -u -rd5ad23d54e43221d9682c715519004cf8bbbfc2f -r6f0463297ec65a9796cf79da577b4c0280ddfd5e
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/TblMonitoringController.java	(.../TblMonitoringController.java)	(revision d5ad23d54e43221d9682c715519004cf8bbbfc2f)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/TblMonitoringController.java	(.../TblMonitoringController.java)	(revision 6f0463297ec65a9796cf79da577b4c0280ddfd5e)
@@ -3,13 +3,11 @@
 import java.io.IOException;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.tool.leaderselection.model.LeaderselectionUser;
 import org.lamsfoundation.lams.tool.leaderselection.service.ILeaderselectionService;
 import org.lamsfoundation.lams.util.WebUtil;
-import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -37,7 +35,7 @@
      * @throws IOException
      * @throws JSONException
      */
-    @RequestMapping(path="/changeLeader", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @RequestMapping(path = "/changeLeader", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     @ResponseBody
     public String changeLeader(HttpServletRequest request) throws IOException {
 
Index: lams_tool_leader/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rd5ad23d54e43221d9682c715519004cf8bbbfc2f -r6f0463297ec65a9796cf79da577b4c0280ddfd5e
--- lams_tool_leader/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision d5ad23d54e43221d9682c715519004cf8bbbfc2f)
+++ lams_tool_leader/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 6f0463297ec65a9796cf79da577b4c0280ddfd5e)
@@ -32,7 +32,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
Index: lams_tool_leader/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -r540199b8a30f643c2ca5960c007e5bef74acd397 -r6f0463297ec65a9796cf79da577b4c0280ddfd5e
--- lams_tool_leader/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 540199b8a30f643c2ca5960c007e5bef74acd397)
+++ lams_tool_leader/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 6f0463297ec65a9796cf79da577b4c0280ddfd5e)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_leader/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r5bdde98b1e94d44d239a50549987293714a5bef1 -r6f0463297ec65a9796cf79da577b4c0280ddfd5e
--- lams_tool_leader/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 5bdde98b1e94d44d239a50549987293714a5bef1)
+++ lams_tool_leader/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 6f0463297ec65a9796cf79da577b4c0280ddfd5e)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -284,42 +283,42 @@
 					<label for="minimum-rates">
 						<fmt:message key="${minimumLabel}" />
 					</label>
-					<html:select property="${formContentPrefix}minimumRates" styleId="minimum-rates" onmouseup="validateRatingLimits(true);" 
+					<form:select property="${formContentPrefix}minimumRates" styleId="minimum-rates" onmouseup="validateRatingLimits(true);" 
 							styleClass="form-control form-control-inline">
-						<html:option value="0">
+						<form:option value="0">
 							<fmt:message key="${noMinimumLabel}" />
-						</html:option>
-						<html:option value="1">1</html:option>
-						<html:option value="2">2</html:option>
-						<html:option value="3">3</html:option>
-						<html:option value="4">4</html:option>
-						<html:option value="5">5</html:option>
-						<html:option value="6">6</html:option>
-						<html:option value="7">7</html:option>
-						<html:option value="8">8</html:option>
-						<html:option value="9">9</html:option>
-						<html:option value="10">10</html:option>
-					</html:select>
+						</form:option>
+						<form:option value="1">1</form:option>
+						<form:option value="2">2</form:option>
+						<form:option value="3">3</form:option>
+						<form:option value="4">4</form:option>
+						<form:option value="5">5</form:option>
+						<form:option value="6">6</form:option>
+						<form:option value="7">7</form:option>
+						<form:option value="8">8</form:option>
+						<form:option value="9">9</form:option>
+						<form:option value="10">10</form:option>
+					</form:select>
 				
 					<label for="maximum-rates">
 						<fmt:message key="${maximumLabel}" />
 					</label>
-					<html:select property="${formContentPrefix}maximumRates" styleId="maximum-rates" onmouseup="validateRatingLimits(false);" 
+					<form:select property="${formContentPrefix}maximumRates" styleId="maximum-rates" onmouseup="validateRatingLimits(false);" 
 							styleClass="form-control form-control-inline">
-						<html:option value="0">
+						<form:option value="0">
 							<fmt:message key="${noMaximumLabel}" />
-						</html:option>
-						<html:option value="1">1</html:option>
-						<html:option value="2">2</html:option>
-						<html:option value="3">3</html:option>
-						<html:option value="4">4</html:option>
-						<html:option value="5">5</html:option>
-						<html:option value="6">6</html:option>
-						<html:option value="7">7</html:option>
-						<html:option value="8">8</html:option>
-						<html:option value="9">9</html:option>
-						<html:option value="10">10</html:option>
-					</html:select>
+						</form:option>
+						<form:option value="1">1</form:option>
+						<form:option value="2">2</form:option>
+						<form:option value="3">3</form:option>
+						<form:option value="4">4</form:option>
+						<form:option value="5">5</form:option>
+						<form:option value="6">6</form:option>
+						<form:option value="7">7</form:option>
+						<form:option value="8">8</form:option>
+						<form:option value="9">9</form:option>
+						<form:option value="10">10</form:option>
+					</form:select>
 				</div>
 			</c:if>
 	
Index: lams_tool_leader/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r500ae45f4243aa718eac7436bc903b4f137a3aa7 -r6f0463297ec65a9796cf79da577b4c0280ddfd5e
--- lams_tool_leader/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 500ae45f4243aa718eac7436bc903b4f137a3aa7)
+++ lams_tool_leader/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 6f0463297ec65a9796cf79da577b4c0280ddfd5e)
@@ -1,5 +1,4 @@
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
@@ -42,23 +41,23 @@
 
 <div class="checkbox">
 	<label>
-	<html:checkbox property="${allowCommentsVariableName}" value="1"
+	<form:checkbox path="${allowCommentsVariableName}" value="1"
 		styleId="${allowCommentsVariableName}">
-	</html:checkbox>
+	</form:checkbox>
 	<fmt:message key="${allowCommentLabelKey}"/>
 	</label>
 </div>
 
 <div id="likedislike">
 <div class="loffset20">
-		<html:radio property="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
-		<html:radio property="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
+		<form:radio path="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
+		<form:radio path="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
 <div class="checkbox">
 	<label>
-	<html:checkbox property="${allowAnonymousVariableName}" 
+	<form:checkbox path="${allowAnonymousVariableName}" 
 		styleId="${allowAnonymousVariableName}">
-	</html:checkbox>
+	</form:checkbox>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
 </div>
Index: lams_tool_leader/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r35a96de80ddf8f88a34d7f75eaf71748db934044 -r6f0463297ec65a9796cf79da577b4c0280ddfd5e
--- lams_tool_leader/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 35a96de80ddf8f88a34d7f75eaf71748db934044)
+++ lams_tool_leader/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 6f0463297ec65a9796cf79da577b4c0280ddfd5e)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_leader/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -refa51a5d0464d96fada4e5a70f1fb86c2d726717 -r6f0463297ec65a9796cf79da577b4c0280ddfd5e
--- lams_tool_leader/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision efa51a5d0464d96fada4e5a70f1fb86c2d726717)
+++ lams_tool_leader/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 6f0463297ec65a9796cf79da577b4c0280ddfd5e)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_leader/web/WEB-INF/tags/TabBodyArea.tag
===================================================================
diff -u -ra6f139bf7f2aeceb96792867e30e3de3959bd1f0 -r6f0463297ec65a9796cf79da577b4c0280ddfd5e
--- lams_tool_leader/web/WEB-INF/tags/TabBodyArea.tag	(.../TabBodyArea.tag)	(revision a6f139bf7f2aeceb96792867e30e3de3959bd1f0)
+++ lams_tool_leader/web/WEB-INF/tags/TabBodyArea.tag	(.../TabBodyArea.tag)	(revision 6f0463297ec65a9796cf79da577b4c0280ddfd5e)
@@ -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_leader/web/WEB-INF/tags/TextSearch.tag
===================================================================
diff -u -rdc884b8e6274ebbc664d1ee940e565803445bb26 -r6f0463297ec65a9796cf79da577b4c0280ddfd5e
--- lams_tool_leader/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
+++ lams_tool_leader/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision 6f0463297ec65a9796cf79da577b4c0280ddfd5e)
@@ -32,12 +32,11 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
+<%@ 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" %>
@@ -53,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"/>
@@ -85,52 +84,40 @@
 
 <!-- begin text search form content -->
 	
-<c:if test="${wrapInFormTag}">
-	<form action="${action}" id="${formID}" name="${formID}">
-</c:if>
-		<html:hidden property="sessionMapID" />
-		<h4><fmt:message key="${headingLabelKey}" /></h4>
-		<table>
-			<tr>
-				<td>
-					<fmt:message key="${allWordsLabelKey}" />
-				</td>
-				<td>
-					<html:text size="40" property="allWords" />
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<fmt:message key="${phraseLabelKey}" />
-				</td>
-				<td>
-					<html:text size="40" property="phrase" />
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<fmt:message key="${anyWordsLabelKey}" />
-				</td>
-				<td>
-					<html:text size="40" property="anyWords" /> 
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<fmt:message key="${excludedWordsLabelKey}" />
-				</td>
-				<td>
-					<html:text size="40" property="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_leader/web/common/messages.jsp
===================================================================
diff -u -rc05d26819a155980f333e1a4aea16afe974119e3 -r6f0463297ec65a9796cf79da577b4c0280ddfd5e
--- lams_tool_leader/web/common/messages.jsp	(.../messages.jsp)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
+++ lams_tool_leader/web/common/messages.jsp	(.../messages.jsp)	(revision 6f0463297ec65a9796cf79da577b4c0280ddfd5e)
@@ -4,7 +4,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>
Index: lams_tool_leader/web/pages/learning/leaderselection.jsp
===================================================================
diff -u -rc05d26819a155980f333e1a4aea16afe974119e3 -r6f0463297ec65a9796cf79da577b4c0280ddfd5e
--- lams_tool_leader/web/pages/learning/leaderselection.jsp	(.../leaderselection.jsp)	(revision c05d26819a155980f333e1a4aea16afe974119e3)
+++ lams_tool_leader/web/pages/learning/leaderselection.jsp	(.../leaderselection.jsp)	(revision 6f0463297ec65a9796cf79da577b4c0280ddfd5e)
@@ -50,7 +50,7 @@
 
     function finishActivity(){
     	document.getElementById("finishButton").disabled = true;
-		location.href = '<c:url value="/learning.do"/>?dispatch=finishActivity&toolSessionID=${toolSessionID}';
+		location.href = '<c:url value="/learning/finishActivity.do?toolSessionID=${toolSessionID}"/>"';
     }
 
     <%-- Init websocket only if group leader is not chosen --%>