Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java
===================================================================
diff -u -r6e7ab7890111cde84e6557c3507a1e9d3682e318 -r3eb0caa98564b709116d6e84af92eb3f60c9ff3a
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java	(.../GroupingAJAXController.java)	(revision 6e7ab7890111cde84e6557c3507a1e9d3682e318)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java	(.../GroupingAJAXController.java)	(revision 3eb0caa98564b709116d6e84af92eb3f60c9ff3a)
@@ -40,9 +40,7 @@
 import javax.servlet.http.HttpSession;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
+import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.learning.web.action.GroupingAction;
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.learningdesign.Group;
@@ -61,9 +59,13 @@
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.usermanagement.util.FirstNameAlphabeticComparator;
 import org.lamsfoundation.lams.util.WebUtil;
-import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.springframework.beans.factory.annotation.Autowired;
+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.ResponseBody;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
@@ -79,8 +81,19 @@
  *
  * @author Fiona Malikoff
  */
-public class GroupingAJAXAction extends LamsDispatchAction {
+@Controller
+@RequestMapping("/grouping")
+public class GroupingAJAXController {
 
+    @Autowired
+    private WebApplicationContext applicationContext;
+
+    @Autowired
+    @Qualifier("monitoringService")
+    private IMonitoringService monitoringService;
+
+    private static Logger log = Logger.getLogger(GroupingAJAXController.class);
+
     // ---------------------------------------------------------------------
 
     private static final String CHOSEN_GROUPING_SCREEN = "chosenGrouping";
@@ -101,19 +114,17 @@
      *
      * Input parameters: activityID
      */
-    public ActionForward startGrouping(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, ServletException {
-	
-	return startGrouping(mapping, form, request, response, false);
+    @RequestMapping("/startGrouping")
+    public String startGrouping(HttpServletRequest request) throws IOException, ServletException {
+
+	return startGrouping(request, false);
     }
-    
-    private ActionForward startGrouping(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response, boolean forcePrintView) throws IOException, ServletException {
-    
+
+    private String startGrouping(HttpServletRequest request, boolean forcePrintView)
+	    throws IOException, ServletException {
+
 	Long activityID = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID);
 	Long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
-	IMonitoringService monitoringService = MonitoringServiceProxy
-		.getMonitoringService(getServlet().getServletContext());
 	Activity activity = monitoringService.getActivityById(activityID);
 
 	Grouping grouping = null;
@@ -126,10 +137,10 @@
 
 	request.setAttribute(AttributeNames.PARAM_ACTIVITY_ID, activityID);
 	request.setAttribute(AttributeNames.PARAM_LESSON_ID, lessonId);
-	request.setAttribute(GroupingAJAXAction.PARAM_ACTIVITY_TITLE, activity.getTitle());
-	request.setAttribute(GroupingAJAXAction.PARAM_ACTIVITY_DESCRIPTION, activity.getDescription());
+	request.setAttribute(GroupingAJAXController.PARAM_ACTIVITY_TITLE, activity.getTitle());
+	request.setAttribute(GroupingAJAXController.PARAM_ACTIVITY_DESCRIPTION, activity.getDescription());
 
-	if ( !forcePrintView && grouping.isChosenGrouping()) {
+	if (!forcePrintView && grouping.isChosenGrouping()) {
 	    // can I remove groups/users - can't if tool sessions have been created
 	    Set<Group> groups = grouping.getGroups();
 	    Iterator<Group> iter = groups.iterator();
@@ -145,12 +156,12 @@
 	    // groups due to the branching relationship.
 	    boolean usedForBranching = grouping.isUsedForBranching();
 
-	    request.setAttribute(GroupingAJAXAction.PARAM_MAY_DELETE, mayDelete);
-	    request.setAttribute(GroupingAJAXAction.PARAM_USED_FOR_BRANCHING, usedForBranching);
-	    request.setAttribute(GroupingAJAXAction.PARAM_MAX_NUM_GROUPS, grouping.getMaxNumberOfGroups());
-	    request.setAttribute(GroupingAJAXAction.PARAM_VIEW_MODE, Boolean.FALSE);
+	    request.setAttribute(GroupingAJAXController.PARAM_MAY_DELETE, mayDelete);
+	    request.setAttribute(GroupingAJAXController.PARAM_USED_FOR_BRANCHING, usedForBranching);
+	    request.setAttribute(GroupingAJAXController.PARAM_MAX_NUM_GROUPS, grouping.getMaxNumberOfGroups());
+	    request.setAttribute(GroupingAJAXController.PARAM_VIEW_MODE, Boolean.FALSE);
 
-	    return mapping.findForward(GroupingAJAXAction.CHOSEN_GROUPING_SCREEN);
+	    return "grouping/chosenGrouping";
 	}
 
 	SortedSet<Group> groups = new TreeSet<>(new GroupComparator());
@@ -166,69 +177,70 @@
 
 	request.setAttribute(GroupingAction.GROUPS, groups);
 	// go to a view only screen for random grouping
-	return mapping.findForward(GroupingAJAXAction.VIEW_GROUPS_SCREEN);
+	return "grouping/viewGroups";
     }
-    
+
     /**
      * Called by the chosen grouping / course grouping screen to show a print version of the grouping.
      */
-    public ActionForward printGrouping(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, ServletException {
-	
+    @RequestMapping("/printGrouping")
+    public String printGrouping(HttpServletRequest request) throws IOException, ServletException {
+
 	Long activityID = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID, true);
-	if ( activityID != null ) {
+	if (activityID != null) {
 	    // normal activity based processing, startGrouping can handle it as it supports the normal view screen in monitoring
-	    return startGrouping(mapping, form, request, response, true);
+	    return startGrouping(request, true);
 	}
-	
+
 	// Not activity? Then it must be the course grouping print view request
 	Long orgGroupingId = WebUtil.readLongParam(request, "groupingId", true);
 	OrganisationGrouping orgGrouping = null;
 	if (orgGroupingId != null) {
 	    IUserManagementService userManagementService = MonitoringServiceProxy
-			.getUserManagementService(getServlet().getServletContext());
+		    .getUserManagementService(applicationContext.getServletContext());
 	    orgGrouping = (OrganisationGrouping) userManagementService.findById(OrganisationGrouping.class,
 		    orgGroupingId);
 	}
 
-	SortedSet<OrganisationGroup> groups = new TreeSet<OrganisationGroup>();
-	if ( orgGrouping != null ) {
+	SortedSet<OrganisationGroup> groups = new TreeSet<>();
+	if (orgGrouping != null) {
 	    groups.addAll(orgGrouping.getGroups());
 
 	    // sort users with first, then last name, then login
 	    Comparator<User> userComparator = new FirstNameAlphabeticComparator();
 	    for (OrganisationGroup group : groups) {
-		Set<User> sortedUsers = new TreeSet<User>(userComparator);
+		Set<User> sortedUsers = new TreeSet<>(userComparator);
 		sortedUsers.addAll(group.getUsers());
 		group.setUsers(sortedUsers);
 	    }
 	}
 
 	request.setAttribute(GroupingAction.GROUPS, groups);
 	request.setAttribute("isCourseGrouping", true); // flag to page it is a course grouping so use the field names for OrganisationGroup
-	return mapping.findForward(GroupingAJAXAction.VIEW_GROUPS_SCREEN);
+	return "grouping/viewGroups";
     }
+
     /**
      * Moves users between groups, removing them from previous group and creating a new one, if needed.
      */
-    public ActionForward addMembers(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException {
+    @RequestMapping("/addMembers")
+    @ResponseBody
+    public String addMembers(HttpServletRequest request, HttpServletResponse response) throws IOException {
 	response.setContentType("application/json;charset=utf-8");
 	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
 	boolean result = true;
 
 	Long activityID = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID);
-	String membersParam = WebUtil.readStrParam(request, GroupingAJAXAction.PARAM_MEMBERS, true);
+	String membersParam = WebUtil.readStrParam(request, GroupingAJAXController.PARAM_MEMBERS, true);
 	String[] members = StringUtils.isBlank(membersParam) ? null : membersParam.split(",");
 
 	// remove users from current group
-	IMonitoringService monitoringService = MonitoringServiceProxy
-		.getMonitoringService(getServlet().getServletContext());
 	if (members != null) {
 	    Activity activity = monitoringService.getActivityById(activityID);
 	    Grouping grouping = activity.isChosenBranchingActivity() ? activity.getGrouping()
 		    : ((GroupingActivity) activity).getCreateGrouping();
-	    User exampleUser = (User) MonitoringServiceProxy.getUserManagementService(getServlet().getServletContext())
+	    User exampleUser = (User) MonitoringServiceProxy
+		    .getUserManagementService(applicationContext.getServletContext())
 		    .findById(User.class, Integer.valueOf(members[0]));
 	    Group group = grouping.getGroupBy(exampleUser);
 	    // null group means that user is not assigned anywhere in this grouping
@@ -237,15 +249,15 @@
 		result = group.mayBeDeleted();
 
 		if (result) {
-		    if (LamsDispatchAction.log.isDebugEnabled()) {
-			LamsDispatchAction.log.debug("Removing users " + membersParam.toString() + " from group "
+		    if (GroupingAJAXController.log.isDebugEnabled()) {
+			GroupingAJAXController.log.debug("Removing users " + membersParam.toString() + " from group "
 				+ group.getGroupId() + " in activity " + activityID);
 		    }
 
 		    try {
 			monitoringService.removeUsersFromGroup(activityID, group.getGroupId(), members);
 		    } catch (LessonServiceException e) {
-			LamsDispatchAction.log.error(e);
+			GroupingAJAXController.log.error(e);
 			result = false;
 		    }
 		}
@@ -262,9 +274,10 @@
 	// group ID = -1 means that user is not being assigned to any new group, i.e. becomse unassigned
 	if (result && ((groupID == null) || (groupID > 0))) {
 	    if (groupID == null) {
-		String name = WebUtil.readStrParam(request, GroupingAJAXAction.PARAM_NAME);
-		if (LamsDispatchAction.log.isDebugEnabled()) {
-		    LamsDispatchAction.log.debug("Creating group with name \"" + name + "\" in activity " + activityID);
+		String name = WebUtil.readStrParam(request, GroupingAJAXController.PARAM_NAME);
+		if (GroupingAJAXController.log.isDebugEnabled()) {
+		    GroupingAJAXController.log
+			    .debug("Creating group with name \"" + name + "\" in activity " + activityID);
 		}
 		Group group = monitoringService.addGroup(activityID, name, true);
 		if (group == null) {
@@ -278,35 +291,35 @@
 	    }
 
 	    if (result && (members != null)) {
-		if (LamsDispatchAction.log.isDebugEnabled()) {
-		    LamsDispatchAction.log.debug("Adding users " + membersParam.toString() + " to group " + groupID
+		if (GroupingAJAXController.log.isDebugEnabled()) {
+		    GroupingAJAXController.log.debug("Adding users " + membersParam.toString() + " to group " + groupID
 			    + " in activity " + activityID);
 		}
 
 		// add users to the given group
 		try {
 		    monitoringService.addUsersToGroup(activityID, groupID, members);
 		} catch (LessonServiceException e) {
-		    LamsDispatchAction.log.error(e);
+		    GroupingAJAXController.log.error(e);
 		    result = false;
 		}
 	    }
 	}
 
 	responseJSON.put("result", result);
 	response.getWriter().write(responseJSON.toString());
-	return null;
+	return responseJSON.toString();
     }
 
     /**
      * Stores lesson grouping as a course grouping.
      */
-    public ActionForward saveAsCourseGrouping(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException {
-	IMonitoringService monitoringService = MonitoringServiceProxy
-		.getMonitoringService(getServlet().getServletContext());
+    @RequestMapping("/saveAsCourseGrouping")
+    @ResponseBody
+    public String saveAsCourseGrouping(HttpServletRequest request, HttpServletResponse response) throws IOException {
+
 	IUserManagementService userManagementService = MonitoringServiceProxy
-		.getUserManagementService(getServlet().getServletContext());
+		.getUserManagementService(applicationContext.getServletContext());
 	HttpSession ss = SessionManager.getSession();
 	Integer userId = ((UserDTO) ss.getAttribute(AttributeNames.USER)).getUserID();
 	Integer organisationId = WebUtil.readIntParam(request, AttributeNames.PARAM_ORGANISATION_ID);
@@ -347,23 +360,20 @@
 	response.setContentType("application/json;charset=utf-8");
 	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
 	responseJSON.put("result", true);
-	response.getWriter().write(responseJSON.toString());
-	return null;
+	return responseJSON.toString();
     }
 
     /**
      * Renames the group.
      */
-    public ActionForward changeGroupName(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
+    @RequestMapping("/changeGroupName")
+    public String changeGroupName(HttpServletRequest request) {
 	Long groupID = WebUtil.readLongParam(request, AttributeNames.PARAM_GROUP_ID);
-	String name = WebUtil.readStrParam(request, GroupingAJAXAction.PARAM_NAME);
+	String name = WebUtil.readStrParam(request, GroupingAJAXController.PARAM_NAME);
 	if (name != null) {
-	    if (LamsDispatchAction.log.isDebugEnabled()) {
-		LamsDispatchAction.log.debug("Renaming group  " + groupID + " to \"" + name + "\"");
+	    if (GroupingAJAXController.log.isDebugEnabled()) {
+		GroupingAJAXController.log.debug("Renaming group  " + groupID + " to \"" + name + "\"");
 	    }
-	    IMonitoringService monitoringService = MonitoringServiceProxy
-		    .getMonitoringService(getServlet().getServletContext());
 	    monitoringService.setGroupName(groupID, name);
 	}
 	return null;
@@ -373,11 +383,11 @@
      * Checks if a course grouping name is unique inside of this organisation and thus whether the new group can be
      * named using it
      */
-    @SuppressWarnings("unchecked")
-    public ActionForward checkGroupingNameUnique(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException {
+    @RequestMapping("/checkGroupingNameUnique")
+    @ResponseBody
+    public String checkGroupingNameUnique(HttpServletRequest request, HttpServletResponse response) throws IOException {
 	IUserManagementService userManagementService = MonitoringServiceProxy
-		.getUserManagementService(getServlet().getServletContext());
+		.getUserManagementService(applicationContext.getServletContext());
 
 	Integer organisationId = WebUtil.readIntParam(request, AttributeNames.PARAM_ORGANISATION_ID);
 	String newGroupingName = request.getParameter("name");
@@ -393,48 +403,45 @@
 	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
 	responseJSON.put("isGroupingNameUnique", isGroupingNameUnique);
 	response.setContentType("application/json;charset=utf-8");
-	response.getWriter().write(responseJSON.toString());
-	return null;
+	return responseJSON.toString();
     }
 
     /**
      * Checks if a group can be removed and performs it.
      */
-    public ActionForward removeGroup(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException {
+    @RequestMapping("/removeGroup")
+    @ResponseBody
+    public String removeGroup(HttpServletRequest request, HttpServletResponse response) throws IOException {
 	response.setContentType("application/json;charset=utf-8");
 	Long activityID = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID);
 	Long groupID = WebUtil.readLongParam(request, AttributeNames.PARAM_GROUP_ID);
-	IMonitoringService monitoringService = MonitoringServiceProxy
-		.getMonitoringService(getServlet().getServletContext());
 	boolean result = true;
 
 	// check if the group can be removed
-	Group group = (Group) MonitoringServiceProxy.getUserManagementService(getServlet().getServletContext())
+	Group group = (Group) MonitoringServiceProxy.getUserManagementService(applicationContext.getServletContext())
 		.findById(Group.class, groupID);
 	result = group.mayBeDeleted();
 
 	if (result) {
 	    try {
-		if (LamsDispatchAction.log.isDebugEnabled()) {
-		    LamsDispatchAction.log.debug("Removing group  " + groupID + " from activity " + activityID);
+		if (GroupingAJAXController.log.isDebugEnabled()) {
+		    GroupingAJAXController.log.debug("Removing group  " + groupID + " from activity " + activityID);
 		}
 		monitoringService.removeGroup(activityID, groupID);
 	    } catch (LessonServiceException e) {
-		LamsDispatchAction.log.error(e);
+		GroupingAJAXController.log.error(e);
 		result = false;
 	    }
 	}
 	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
 	responseJSON.put("result", result);
-	response.getWriter().write(responseJSON.toString());
-	return null;
+	return responseJSON.toString();
     }
 
     private ISecurityService getSecurityService() {
 	if (securityService == null) {
 	    WebApplicationContext ctx = WebApplicationContextUtils
-		    .getRequiredWebApplicationContext(getServlet().getServletContext());
+		    .getRequiredWebApplicationContext(applicationContext.getServletContext());
 	    securityService = (ISecurityService) ctx.getBean("securityService");
 	}
 	return securityService;
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java
===================================================================
diff -u -r6e7ab7890111cde84e6557c3507a1e9d3682e318 -r3eb0caa98564b709116d6e84af92eb3f60c9ff3a
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java	(.../TblMonitoringController.java)	(revision 6e7ab7890111cde84e6557c3507a1e9d3682e318)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java	(.../TblMonitoringController.java)	(revision 3eb0caa98564b709116d6e84af92eb3f60c9ff3a)
@@ -11,12 +11,8 @@
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 import org.apache.log4j.Logger;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
 import org.lamsfoundation.lams.gradebook.GradebookUserActivity;
 import org.lamsfoundation.lams.gradebook.service.IGradebookService;
 import org.lamsfoundation.lams.learningdesign.Activity;
@@ -46,8 +42,10 @@
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.util.CentralConstants;
 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.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
@@ -56,10 +54,15 @@
  *
  * @author Andrey Balan
  */
-public class TblMonitoringAction extends LamsDispatchAction {
+@Controller
+@RequestMapping("/tblmonitor")
+public class TblMonitoringController {
 
-    private static Logger log = Logger.getLogger(TblMonitoringAction.class);
+    @Autowired
+    private WebApplicationContext applicationContext;
 
+    private static Logger log = Logger.getLogger(TblMonitoringController.class);
+
     private static ILessonService lessonService;
     private static IMonitoringService monitoringService;
     private static ILamsCoreToolService coreToolService;
@@ -70,9 +73,8 @@
     /**
      * Displays addStudent page.
      */
-    @Override
-    public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws Exception {
+    @RequestMapping("/start")
+    public String unspecified(HttpServletRequest request) throws Exception {
 	initServices();
 
 	long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
@@ -82,14 +84,14 @@
 
 	List<Activity> lessonActivities = getLessonActivities(lesson);
 	setupAvailableActivityTypes(request, lessonActivities);
-	return mapping.findForward("tblmonitor");
+	return "tblmonitor/tblmonitor";
     }
 
     /**
      * Shows Teams page
      */
-    public ActionForward teams(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, ServletException {
+    @RequestMapping("/teams")
+    public String teams(HttpServletRequest request) throws IOException, ServletException {
 
 	long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
 	Lesson lesson = lessonService.getLesson(lessonId);
@@ -119,14 +121,14 @@
 	    traGradebookUserActivities = gradebookService.getGradebookUserActivities(traToolActivityId);
 	}
 
-	Set<Long> leaderUserIds = leaderselectionToolActivityId == null ? new HashSet<Long>()
+	Set<Long> leaderUserIds = leaderselectionToolActivityId == null ? new HashSet<>()
 		: toolService.getLeaderUserId(leaderselectionToolActivityId);
 
 	GroupingActivity groupingActivity = getGroupingActivity(lesson);
 	Grouping grouping = groupingActivity == null ? null : groupingActivity.getCreateGrouping();
 	Set<Group> groups = grouping == null ? null : grouping.getGroups();
 
-	Set<TblGroupDTO> groupDtos = new TreeSet<TblGroupDTO>();
+	Set<TblGroupDTO> groupDtos = new TreeSet<>();
 	if (groups != null) {
 	    for (Group group : groups) {
 		TblGroupDTO groupDto = new TblGroupDTO(group);
@@ -169,17 +171,17 @@
 	}
 	request.setAttribute("groupDtos", groupDtos);
 
-	return mapping.findForward("teams");
+	return "tblmonitor/teams";
     }
 
     /**
      * Shows Gates page
      */
-    public ActionForward gates(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, ServletException {
+    @RequestMapping("/gates")
+    public String gates(HttpServletRequest request) throws IOException, ServletException {
 	long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
 
-	List<PermissionGateDTO> permissionGates = new ArrayList<PermissionGateDTO>();
+	List<PermissionGateDTO> permissionGates = new ArrayList<>();
 
 	List<ContributeActivityDTO> contributeActivities = monitoringService.getAllContributeActivityDTO(lessonId);
 	if (contributeActivities != null) {
@@ -211,14 +213,14 @@
 	}
 
 	request.setAttribute("permissionGates", permissionGates);
-	return mapping.findForward("gates");
+	return "tblmonitor/gates";
     }
 
     /**
      * Shows forum page
      */
-    public ActionForward forum(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, ServletException {
+    @RequestMapping("/forum")
+    public String forum(HttpServletRequest request) throws IOException, ServletException {
 
 	long forumActivityId = WebUtil.readLongParam(request, "activityId");
 	ToolActivity forumActivity = (ToolActivity) monitoringService.getActivityById(forumActivityId);
@@ -229,14 +231,14 @@
 	Set<ToolSession> toolSessions = forumActivity.getToolSessions();
 	request.setAttribute("toolSessions", toolSessions);
 
-	return mapping.findForward("forum");
+	return "tblmonitor/forum";
     }
 
     /**
      * Shows peerreview page
      */
-    public ActionForward peerreview(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, ServletException {
+    @RequestMapping("/peerreview")
+    public String peerreview(HttpServletRequest request) throws IOException, ServletException {
 
 	long peerreviewActivityId = WebUtil.readLongParam(request, "activityId");
 	ToolActivity peerreviewActivity = (ToolActivity) monitoringService.getActivityById(peerreviewActivityId);
@@ -247,18 +249,18 @@
 	Set<ToolSession> toolSessions = peerreviewActivity.getToolSessions();
 	request.setAttribute("toolSessions", toolSessions);
 
-	return mapping.findForward("peerreview");
+	return "tblmonitor/peerreview";
     }
 
     /**
      * Shows sequence diagram page
      */
-    public ActionForward sequence(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, ServletException {
+    @RequestMapping("/sequence")
+    public String sequence(HttpServletRequest request) throws IOException, ServletException {
 	long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
 	Lesson lesson = lessonService.getLesson(lessonId);
 	request.setAttribute("lesson", lesson);
-	return mapping.findForward("sequence");
+	return "tblmonitor/sequence";
     }
 
     /**
@@ -276,7 +278,7 @@
 	 */
 	Activity firstActivity = activityDAO
 		.getActivityByActivityId(lesson.getLearningDesign().getFirstActivity().getActivityId());
-	List<Activity> activities = new ArrayList<Activity>();
+	List<Activity> activities = new ArrayList<>();
 	sortActivitiesByLearningDesignOrder(firstActivity, activities);
 
 	return activities;
@@ -334,7 +336,7 @@
     }
 
     private GroupingActivity getGroupingActivity(Lesson lesson) {
-	Set<Activity> activities = new TreeSet<Activity>();
+	Set<Activity> activities = new TreeSet<>();
 
 	/*
 	 * Hibernate CGLIB is failing to load the first activity in the sequence as a ToolActivity for some mysterious
@@ -358,7 +360,7 @@
     }
 
     private void setupAvailableActivityTypes(HttpServletRequest request, List<Activity> activities) {
-	
+
 	//check if there is Scratchie activity. It's used only in case of LKC TBL monitoring, when all assessment are treated as AEs
 	boolean isScratchieAvailable = false;
 	for (Activity activity : activities) {
@@ -401,7 +403,8 @@
 		}
 
 		//aes are counted only after Scratchie activity, or for LKC TBL monitoring
-		if ((scratchiePassed || !isScratchieAvailable) && CentralConstants.TOOL_SIGNATURE_ASSESSMENT.equals(toolSignature)) {
+		if ((scratchiePassed || !isScratchieAvailable)
+			&& CentralConstants.TOOL_SIGNATURE_ASSESSMENT.equals(toolSignature)) {
 		    request.setAttribute("isAeAvailable", true);
 		    //prepare assessment details to be passed to Assessment tool
 		    assessmentToolContentIds += toolContentId + ",";
@@ -439,7 +442,7 @@
     }
 
     private void initServices() {
-	ServletContext servletContext = this.getServlet().getServletContext();
+	ServletContext servletContext = this.applicationContext.getServletContext();
 	WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(servletContext);
 	if (lessonService == null) {
 	    lessonService = (ILessonService) ctx.getBean("lessonService");
Index: lams_monitoring/web/complexProgress.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r3eb0caa98564b709116d6e84af92eb3f60c9ff3a
--- lams_monitoring/web/complexProgress.jsp	(.../complexProgress.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/complexProgress.jsp	(.../complexProgress.jsp)	(revision 3eb0caa98564b709116d6e84af92eb3f60c9ff3a)
@@ -1,60 +1,95 @@
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<%-- 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
 
-<lams:Page type="monitor" title="${activityTitle}">
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2 as 
+  published by the Free Software Foundation.
 
-<c:if test="${!hasSequenceActivity}">
-<table class="table table-bordered table-striped table-condensed">
-<c:forEach items="${subActivities}" var="subActivity">
-	<c:set var="id" value="${subActivity.activityID}"/>
-	<tr>
-		<c:choose>
-			<c:when test="${statusMap[id] == 1}">
-				<td><a href="<lams:LAMSURL />/<c:out value="${urlMap[id]}" />"><c:out value="${subActivity.title}"/></a></td>
-				<td><fmt:message key="label.completed" /></td>
-			</c:when>
-			<c:when test="${statusMap[id] == 2}">
-				<td><a href="<lams:LAMSURL />/<c:out value="${urlMap[id]}" />"><c:out value="${subActivity.title}"/></a></td>
-				<td><fmt:message key="label.started" /></td>
-			</c:when>
-			<c:otherwise>
-				<td><c:out value="${subActivity.title}"/></td>
-				<td><fmt:message key="label.not.started" /></td>
-			</c:otherwise>
-		</c:choose>
-	</tr>
-</c:forEach>
-</table>
-</c:if>
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
-<c:if test="${hasSequenceActivity}">
-<c:forEach items="${subActivities}" var="subActivity">
-	<c:set var="id" value="${subActivity.activityID}" />
-	<h4><c:out value="${subActivity.title}" /> -
-	<c:choose>
-		<c:when test="${statusMap[id] == 1}"><fmt:message key="label.completed" /></c:when>
-		<c:when test="${statusMap[id] == 2}"><fmt:message key="label.started" /></c:when>
-		<c:otherwise><fmt:message key="label.not.started" /></c:otherwise>
-	</c:choose>
-	</h4>
-	<table class="table table-bordered table-striped table-condensed">
-		<c:forEach items="${subActivity.childActivities}" var="child">
-			<c:set var="childId" value="${child.activityID}"/>
-			<tr><td>
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+  USA
+
+  http://www.gnu.org/licenses/gpl.txt
+--%>
+<%@ include file="/taglibs.jsp"%>
+
+<!DOCTYPE html>
+<lams:html>
+    <lams:head>
+		<lams:css/>
+		<fmt:setBundle basename = "org.lamsfoundation.lams.monitoring.MonitoringResources" />
+    </lams:head>
+    
+    <body class="stripes">
+		<lams:Page type="monitor" title="${activityTitle}">
+
+		<c:if test="${!hasSequenceActivity}">
+		<table class="table table-bordered table-striped table-condensed">
+		<c:forEach items="${subActivities}" var="subActivity">
+			<c:set var="id" value="${subActivity.activityID}"/>
+			<tr>
+				<c:choose>
+					<c:when test="${statusMap[id] == 1}">
+						<td><a href="<lams:LAMSURL />/<c:out value="${urlMap[id]}" />"><c:out value="${subActivity.title}"/></a></td>
+						<td><fmt:message key="label.completed" /></td>
+					</c:when>
+					<c:when test="${statusMap[id] == 2}">
+						<td><a href="<lams:LAMSURL />/<c:out value="${urlMap[id]}" />"><c:out value="${subActivity.title}"/></a></td>
+						<td><fmt:message key="label.started" /></td>
+					</c:when>
+					<c:otherwise>
+						<td><c:out value="${subActivity.title}"/></td>
+						<td><fmt:message key="label.not.started" /></td>
+					</c:otherwise>
+				</c:choose>
+			</tr>
+		</c:forEach>
+		</table>
+		</c:if>
+		
+		<c:if test="${hasSequenceActivity}">
+		<c:forEach items="${subActivities}" var="subActivity">
+			<c:set var="id" value="${subActivity.activityID}" />
+			<h4><c:out value="${subActivity.title}" /> -
 			<c:choose>
-				<c:when test="${statusMap[childId] == 1 or statusMap[childId] == 2}">
-				<a href="<lams:LAMSURL />/<c:out value="${urlMap[childId]}" />"><c:out value="${child.title}"/></a>
-				</c:when>
-				<c:otherwise>
-				<c:out value="${child.title}"/>
-				</c:otherwise>
+				<c:when test="${statusMap[id] == 1}"><fmt:message key="label.completed" /></c:when>
+				<c:when test="${statusMap[id] == 2}"><fmt:message key="label.started" /></c:when>
+				<c:otherwise><fmt:message key="label.not.started" /></c:otherwise>
 			</c:choose>
-			</td></tr>
+			</h4>
+			<table class="table table-bordered table-striped table-condensed">
+				<c:forEach items="${subActivity.childActivities}" var="child">
+					<c:set var="childId" value="${child.activityID}"/>
+					<tr><td>
+					<c:choose>
+						<c:when test="${statusMap[childId] == 1 or statusMap[childId] == 2}">
+						<a href="<lams:LAMSURL />/<c:out value="${urlMap[childId]}" />"><c:out value="${child.title}"/></a>
+						</c:when>
+						<c:otherwise>
+						<c:out value="${child.title}"/>
+						</c:otherwise>
+					</c:choose>
+					</td></tr>
+				</c:forEach>
+			</table>
 		</c:forEach>
-	</table>
-</c:forEach>
-</c:if>
+		</c:if>
+		
+		</lams:Page>
 
-</lams:Page>
+		<div id="footer">
+		</div><!--closes footer-->
 
+    </body>
+</lams:html>
+
+
+
+
Index: lams_monitoring/web/emailnotifications/additionalSettings.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r3eb0caa98564b709116d6e84af92eb3f60c9ff3a
--- lams_monitoring/web/emailnotifications/additionalSettings.jsp	(.../additionalSettings.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/emailnotifications/additionalSettings.jsp	(.../additionalSettings.jsp)	(revision 3eb0caa98564b709116d6e84af92eb3f60c9ff3a)
@@ -1,9 +1,4 @@
-<%@ taglib uri="tags-tiles" prefix="tiles" %>
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-<%@ taglib uri="tags-function" prefix="fn"%>
+<%@ include file="/taglibs.jsp"%>
 
 <div id="accordion">
 	<h4 id="nowHeader">
Index: lams_monitoring/web/emailnotifications/archivedEmailList.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r3eb0caa98564b709116d6e84af92eb3f60c9ff3a
--- lams_monitoring/web/emailnotifications/archivedEmailList.jsp	(.../archivedEmailList.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/emailnotifications/archivedEmailList.jsp	(.../archivedEmailList.jsp)	(revision 3eb0caa98564b709116d6e84af92eb3f60c9ff3a)
@@ -1,10 +1,4 @@
-<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
-<%@ taglib uri="tags-tiles" prefix="tiles" %>
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-<%@ taglib uri="tags-function" prefix="fn"%>
+<%@ include file="/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
@@ -37,7 +31,7 @@
 			$("#grid" + notificationUid).jqGrid({
 				guiStyle: "bootstrap",
 				iconSet: 'fontAwesome',
-			   	url: "<c:url value='/emailNotifications.do'/>?method=getArchivedRecipients&emailNotificationUid=" + notificationUid,
+			   	url: "<c:url value='/emailNotifications/getArchivedRecipients.do'/>?emailNotificationUid=" + notificationUid,
 				datatype: "json",
 			   	colNames:['<fmt:message key="email.notifications.user.name"/>'],
 			   	colModel:[
@@ -58,7 +52,7 @@
 
 		function exportNotification(notificationUid) {
 			$('#downloadFrame').attr('src',
-					"<c:url value='/emailNotifications.do'/>?method=exportArchivedNotification&emailNotificationUid=" + notificationUid);
+					"<c:url value='/emailNotifications/exportArchivedNotification.do'/>?emailNotificationUid=" + notificationUid);
 		}
 	</script>
 
@@ -125,8 +119,8 @@
 		</c:forEach>
 	</table>
 	
-	<a href="<c:url value='/emailNotifications.do'/>${lessonID == null ? '?method=getCourseView&organisationID='.concat(organisationID)
-																	   : '?method=getLessonView&lessonID='.concat(lessonID)}"
+	<a href="<c:url value='/emailNotifications/'/>${lessonID == null ? 'getCourseView.do?organisationID='.concat(organisationID)
+																	   : 'getLessonView.do?lessonID='.concat(lessonID)}"
 	   class="btn btn-primary pull-right">
 		<fmt:message key="email.notifications.scheduled.messages.list.back" />
 	</a>
Index: lams_monitoring/web/emailnotifications/courseNotifications.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r3eb0caa98564b709116d6e84af92eb3f60c9ff3a
--- lams_monitoring/web/emailnotifications/courseNotifications.jsp	(.../courseNotifications.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/emailnotifications/courseNotifications.jsp	(.../courseNotifications.jsp)	(revision 3eb0caa98564b709116d6e84af92eb3f60c9ff3a)
@@ -1,10 +1,4 @@
-<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
-<%@ taglib uri="tags-tiles" prefix="tiles" %>
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-<%@ taglib uri="tags-function" prefix="fn"%>
+<%@ include file="/taglibs.jsp"%>
 <% pageContext.setAttribute("newLineChar", "\n"); %>
 
 <!DOCTYPE html>
@@ -49,7 +43,7 @@
 			jQuery("#list3").jqGrid({
 				guiStyle: "bootstrap",
 				iconSet: 'fontAwesome',
-			   	url: "<c:url value='/emailNotifications.do'/>?method=getUsers" + getSearchParams(),
+			   	url: "<c:url value='/emailNotifications/getUsers/getUsers.do'/>" + getSearchParams(),
 				datatype: "json",
 			   	colNames:['<fmt:message key="email.notifications.user.name"/>'],
 			   	colModel:[
@@ -149,8 +143,8 @@
     			scheduleDate = (scheduleDate == null) ? "" : scheduleDate.getTime();
     	        $.ajax({
     	        	async: false,
-    	            url: '<c:url value="/emailNotifications.do"/>',
-    	            data: "method=emailUsers&emailBody=" + emailBody + params,
+    	            url: '<c:url value="/emailNotifications/emailUsers.do"/>',
+    	            data: "emailBody=" + emailBody + params,
     	            dataType: 'json',
     	            type: 'post',
     	            success: function (json) {
@@ -169,7 +163,7 @@
 	
 		function getUsers(){
 			var searchParams = getSearchParams();
-			var url = "<c:url value='/emailNotifications.do'/>?method=getUsers" + searchParams;
+			var url = "<c:url value='/emailNotifications/getUsers.do'/>" + searchParams;
 			if (searchParams.length) {
 				$("#list3").setGridParam({datatype:'json', page:1, url: url}).trigger('reloadGrid');	
 			} else {
@@ -223,11 +217,11 @@
 		<div class="row">
 			<div class="col-sm-12">
 				<div class="btn-group pull-right">
-					<a href="<c:url value='/emailNotifications.do'/>?method=showScheduledEmails&organisationID=${org.organisationId}"
+					<a href="<c:url value='/emailNotifications/showScheduledEmails.do'/>?organisationID=${org.organisationId}"
 					   id="listEmailsHref" class="btn btn-default btn-sm">
 						<i class="fa fa-calendar"></i> <fmt:message key="email.notifications.scheduled.messages.button" />
 					</a>
-					<a href="<c:url value='/emailNotifications.do'/>?method=showArchivedEmails&organisationID=${org.organisationId}"
+					<a href="<c:url value='/emailNotifications/showArchivedEmails.do'/>?organisationID=${org.organisationId}"
 					   id="archiveHref" class="btn btn-default btn-sm">
 						<i class="fa fa-archive"></i> <fmt:message key="email.notifications.archived.messages.button" />
 					</a>		
@@ -238,7 +232,7 @@
 			<div class="col-sm-6">
 				<h4><fmt:message key="email.notifications.notify.sudents.that"/></h4>
 				
-				<form action="<c:url value="/emailNotifications.do"/>?method=emailUsers" method="post" id="emailNotificationsForm" >	
+				<form:form action="emailUsers.do" method="post" modelAttribute="emailNotificationsForm" id="emailNotificationsForm" >	
 				
 				<!-- Dropdown menu for choosing a user search type -->
 				<div>
@@ -285,7 +279,7 @@
 		
 				<%@ include file="additionalSettings.jsp"%>
 		
-				</form>
+				</form:form>
 			
 			</div>
 			<div class="col-sm-6">
Index: lams_monitoring/web/emailnotifications/lessonNotifications.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r3eb0caa98564b709116d6e84af92eb3f60c9ff3a
--- lams_monitoring/web/emailnotifications/lessonNotifications.jsp	(.../lessonNotifications.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/emailnotifications/lessonNotifications.jsp	(.../lessonNotifications.jsp)	(revision 3eb0caa98564b709116d6e84af92eb3f60c9ff3a)
@@ -1,10 +1,4 @@
-<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
-<%@ taglib uri="tags-tiles" prefix="tiles" %>
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-<%@ taglib uri="tags-function" prefix="fn"%>
+<%@ include file="/taglibs.jsp"%>
 <% pageContext.setAttribute("newLineChar", "\n"); %>
 
 <!DOCTYPE html>
@@ -50,7 +44,7 @@
 			jQuery("#list3").jqGrid({
 				guiStyle: "bootstrap",
 				iconSet: 'fontAwesome',
-			   	url: "<c:url value='/emailNotifications.do'/>?method=getUsers" + getSearchParams(),
+			   	url: "<c:url value='/emailNotifications/getUsers.do'/>" + getSearchParams(),
 				datatype: "json",
 			   	colNames:['<fmt:message key="email.notifications.user.name"/>'],
 			   	colModel:[
@@ -126,8 +120,8 @@
     			
     	        $.ajax({
     	        	async: false,
-    	            url: '<c:url value="/emailNotifications.do"/>',
-    	            data: "method=emailUsers&emailBody=" + emailBody + params,
+    	            url: '<c:url value="/emailNotifications/emailUsers.do"/>',
+    	            data: "emailBody=" + emailBody + params,
     	            dataType: 'json',
     	            type: 'post',
     	            success: function (json) {
@@ -145,7 +139,7 @@
 		
 		function getUsers(){
 			var searchParams = getSearchParams();
-			var url = "<c:url value='/emailNotifications.do'/>?method=getUsers" + searchParams;
+			var url = "<c:url value='/emailNotifications/getUsers.do'/>" + searchParams;
 			if (searchParams.length) {
 				$("#list3").setGridParam({datatype:'json', page:1, url: url}).trigger('reloadGrid');	
 			} else {
@@ -207,7 +201,7 @@
 			<div class="col-sm-6">
 				<h4><fmt:message key="email.notifications.notify.sudents.that"/></h4>
 				
-				<form action="<c:url value="/emailNotifications.do"/>?method=emailUsers" method="post" id="emailNotificationsForm" >	
+				<form:form action="emailUsers.do" method="post" modelAttribute="emailNotificationsForm" id="emailNotificationsForm" >	
 				
 				
 				<!-- Dropdown menu for choosing a user search type -->
@@ -247,7 +241,7 @@
 				
 				<%@ include file="additionalSettings.jsp"%>
 				
-				</form>			
+				</form:form>			
 			</div>
 			<div class="col-sm-6">
 				<div id="emailTextareaDiv">
Index: lams_monitoring/web/emailnotifications/scheduledEmailList.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r3eb0caa98564b709116d6e84af92eb3f60c9ff3a
--- lams_monitoring/web/emailnotifications/scheduledEmailList.jsp	(.../scheduledEmailList.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/emailnotifications/scheduledEmailList.jsp	(.../scheduledEmailList.jsp)	(revision 3eb0caa98564b709116d6e84af92eb3f60c9ff3a)
@@ -1,10 +1,4 @@
-<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
-<%@ taglib uri="tags-tiles" prefix="tiles" %>
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-<%@ taglib uri="tags-function" prefix="fn"%>
+<%@ include file="/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
@@ -57,12 +51,12 @@
 
 	<c:choose>
 		<c:when test="${lessonID != null}">
-			<c:set var="returnUrlParams">?method=getLessonView&lessonID=${lessonID}</c:set>
-			<c:set var="deleteUrlParams">method=deleteNotification&lessonID=${lessonID}</c:set>
+			<c:set var="returnUrlParams">getLessonView.do?lessonID=${lessonID}</c:set>
+			<c:set var="deleteUrlParams">deleteNotification.do?lessonID=${lessonID}</c:set>
 		</c:when>
 		<c:otherwise>
-			<c:set var="returnUrlParams">?method=getCourseView&organisationID=${organisationID}</c:set>
-			<c:set var="deleteUrlParams">method=deleteNotification&organisationID=${organisationID}</c:set>
+			<c:set var="returnUrlParams">getCourseView.do?organisationID=${organisationID}</c:set>
+			<c:set var="deleteUrlParams">deleteNotification.do?organisationID=${organisationID}</c:set>
 		</c:otherwise>
 	</c:choose>
 
@@ -113,7 +107,7 @@
 		</c:forEach>
 	</table>
 	
-	<a href="<c:url value='/emailNotifications.do'/>${returnUrlParams}" class="btn btn-primary pull-right">
+	<a href="<c:url value='/emailNotifications/'/>${returnUrlParams}" class="btn btn-primary pull-right">
 		<fmt:message key="email.notifications.scheduled.messages.list.back" />
 	</a>
 	</lams:Page>
Index: lams_monitoring/web/errorbox.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r3eb0caa98564b709116d6e84af92eb3f60c9ff3a
--- lams_monitoring/web/errorbox.jsp	(.../errorbox.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/errorbox.jsp	(.../errorbox.jsp)	(revision 3eb0caa98564b709116d6e84af92eb3f60c9ff3a)
@@ -1,15 +1,11 @@
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-<%@ page import="org.apache.struts.Globals" %>
+<%@ include file="/taglibs.jsp"%>
 
-<logic:present name="<%=Globals.ERROR_KEY%>">
-<tr>
-	<td width="10%"  align="right" >
-		<i class="fa fa-fw fa-exclamation-circle text-danger" title="<fmt:message key="error.title"/>"></i>
-	</td>
-	<td width="90%" valign="center" class="body" colspan="2">
-		<html:errors/>
-	</td>
-</tr>
-</logic:present>
+<%-- Error Messages --%>
+<c:set var="errorKey" value="GLOBAL" /> 
+<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}" /><br /> 
+        </c:forEach> 
+    </lams:Alert> 
+</c:if>
Index: lams_monitoring/web/gate/conditionGateContent.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r3eb0caa98564b709116d6e84af92eb3f60c9ff3a
--- lams_monitoring/web/gate/conditionGateContent.jsp	(.../conditionGateContent.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/gate/conditionGateContent.jsp	(.../conditionGateContent.jsp)	(revision 3eb0caa98564b709116d6e84af92eb3f60c9ff3a)
@@ -1,37 +1,67 @@
-	<%@ taglib uri="tags-html" prefix="html" %>
-	<%@ taglib uri="tags-bean" prefix="bean" %>
-	<%@ taglib uri="tags-logic" prefix="logic" %>
-	<%@ taglib uri="tags-core" prefix="c" %>		
-	<%@ taglib uri="tags-fmt" prefix="fmt" %>
-	<%@ taglib uri="tags-lams" prefix="lams" %>
-	
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-	<script type="text/javascript">
-		function allowUsers(who){
-			var allowed = '';
-			$('#' + who + ' input:checked').each(function(){
-				allowed += $(this).val() + ',';
-			});
-			if (allowed == ''){
-				return false;
-			}
-			$('#userId').val(allowed);
-			return true;
-		}
-	</script>
+<%-- 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
 
-	<c:set var="title"><fmt:message key="label.condition.gate.title"/></c:set>
-	<lams:Page title="${title}" type="monitoring">
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2 as 
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+  USA
+
+  http://www.gnu.org/licenses/gpl.txt
+--%>
+<%@ include file="/taglibs.jsp"%>
+
+<!DOCTYPE html>
+<lams:html>
+    <lams:head>
+		<lams:css/>
+		<fmt:setBundle basename = "org.lamsfoundation.lams.monitoring.MonitoringResources" />
 		
-		<%@ include file="gateInfo.jsp" %>
-		<c:if test="${not GateForm.map.gate.gateOpen}" >
-			<p><fmt:message key="label.gate.you.open.message"/><br />
-			<small><em><fmt:message key="message.gate.condition.force.pass" /></em></small></p>
-		</c:if>
-		
-		<%@ include file="gateStatus.jsp" %>
-		<c:if test="${not GateForm.map.gate.gateOpen}" >
-				<%@ include file="openGateSingleUser.jsp" %>
-		</c:if>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+		<script type="text/javascript">
+			function allowUsers(who){
+				var allowed = '';
+				$('#' + who + ' input:checked').each(function(){
+					allowed += $(this).val() + ',';
+				});
+				if (allowed == ''){
+					return false;
+				}
+				$('#userId').val(allowed);
+				return true;
+			}
+		</script>
+    </lams:head>
+    
+    <body class="stripes">
+		<c:set var="title"><fmt:message key="label.condition.gate.title"/></c:set>
+		<lams:Page title="${title}" type="monitoring">
+			
+			<%@ include file="gateInfo.jsp" %>
+			<c:if test="${not gateForm.gate.gateOpen}" >
+				<p><fmt:message key="label.gate.you.open.message"/><br />
+				<small><em><fmt:message key="message.gate.condition.force.pass" /></em></small></p>
+			</c:if>
+			
+			<%@ include file="gateStatus.jsp" %>
+			<c:if test="${not gateForm.gate.gateOpen}" >
+					<%@ include file="openGateSingleUser.jsp" %>
+			</c:if>
+	
+		</lams:Page>
 
-	</lams:Page>
\ No newline at end of file
+		<div id="footer">
+		</div><!--closes footer-->
+
+    </body>
+</lams:html>
+
Index: lams_monitoring/web/gate/gateInfo.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r3eb0caa98564b709116d6e84af92eb3f60c9ff3a
--- lams_monitoring/web/gate/gateInfo.jsp	(.../gateInfo.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/gate/gateInfo.jsp	(.../gateInfo.jsp)	(revision 3eb0caa98564b709116d6e84af92eb3f60c9ff3a)
@@ -1,15 +1,15 @@
-<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ include file="/taglibs.jsp"%>
 
-<c:if test="${not empty GateForm.map.gate.description}">
+<c:if test="${not empty gateForm.gate.description}">
 	<!-- general information section-->
 	<p>
-		<lams:out value="${GateForm.map.gate.description}" escapeHtml="true" />
+		<lams:out value="${GateForm.gate.description}" escapeHtml="true" />
 	</p>
 </c:if>
 
 <!--waiting learner information table-->
 
-<c:if test="${not GateForm.map.gate.gateOpen}">
+<c:if test="${not gateForm.gate.gateOpen}">
 	<div id="gateStatus" class="alert alert-danger" style="margin-bottom: 10px; padding: 8px">
 				<div class="media">
 					<div class="media-left">
@@ -24,8 +24,8 @@
 <p>
 <span><fmt:message key="label.grouping.status"/></span> 
 	<strong> <fmt:message key="label.gate.waiting.learners">
-			<fmt:param value="${GateForm.map.waitingLearners}" />
-			<fmt:param value="${GateForm.map.totalLearners}" />
+			<fmt:param value="${gateForm.waitingLearners}" />
+			<fmt:param value="${gateForm.totalLearners}" />
 		</fmt:message>
 	</strong>
 </p>
Index: lams_monitoring/web/gate/gateStatus.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r3eb0caa98564b709116d6e84af92eb3f60c9ff3a
--- lams_monitoring/web/gate/gateStatus.jsp	(.../gateStatus.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/gate/gateStatus.jsp	(.../gateStatus.jsp)	(revision 3eb0caa98564b709116d6e84af92eb3f60c9ff3a)
@@ -1,4 +1,4 @@
-<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ include file="/taglibs.jsp"%>
 
 <c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.timeago.js"></script>
@@ -8,17 +8,17 @@
 	$(document).ready(function() {$("time.timeago").timeago();});
 </script>
 	        
-<c:if test="${not GateForm.map.gate.gateOpen}">
+<c:if test="${not gateForm.gate.gateOpen}">
 
-				<c:if test="${not GateForm.map.readOnly}">
-					<html:form action="/gate?method=openGate" target="_self">
-						<input type="hidden" name="activityId" value="${GateForm.map.activityId}" />
-						<p><html:submit styleClass="btn btn-primary btn-sm voffset10"><fmt:message key="label.gate.open"/></html:submit></p>
-					</html:form>
+				<c:if test="${not GateForm.readOnly}">
+					<form:form action="openGate.do" id="gateForm" modelAttribute="gateForm" target="_self">
+						<input type="hidden" name="activityId" value="${gateForm.map.activityId}" />
+						<p><input type="submit" class="btn btn-primary btn-sm voffset10" value="<fmt:message key="label.gate.open"/>" /></p>
+					</form:form>
 				</c:if>        
         
 </c:if>
-<c:if test="${GateForm.map.gate.gateOpen}">
+<c:if test="${gateForm.gate.gateOpen}">
 
 	<div id="gateStatus" class="alert alert-success" style="margin-bottom: 10px; padding: 8px">
 				<div class="media">
@@ -27,12 +27,12 @@
 					</div>
 					<div class="media-body">
 						<strong><fmt:message key="label.gate.gate.open"/>
-						<c:if test="${not empty GateForm.map.gate.gateOpenTime}">
-							&nbsp;<lams:Date value="${GateForm.map.gate.gateOpenTime}" timeago="true" />
+						<c:if test="${not empty gateForm.map.gate.gateOpenTime}">
+							&nbsp;<lams:Date value="${gateForm.gate.gateOpenTime}" timeago="true" />
 						</c:if>
-						<c:if test="${not empty GateForm.map.gate.gateOpenUser}">
+						<c:if test="${not empty gateForm.map.gate.gateOpenUser}">
 							&nbsp;<fmt:message key="label.gate.gate.open.user">
-								<fmt:param value="${GateForm.map.gate.gateOpenUser.firstName} ${GateForm.map.gate.gateOpenUser.lastName}" />
+								<fmt:param value="${gateForm.gate.gateOpenUser.firstName} ${gateForm.gate.gateOpenUser.lastName}" />
 							</fmt:message>
 						</c:if>
 						</strong>
Index: lams_monitoring/web/gate/openGateSingleUser.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r3eb0caa98564b709116d6e84af92eb3f60c9ff3a
--- lams_monitoring/web/gate/openGateSingleUser.jsp	(.../openGateSingleUser.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/gate/openGateSingleUser.jsp	(.../openGateSingleUser.jsp)	(revision 3eb0caa98564b709116d6e84af92eb3f60c9ff3a)
@@ -12,15 +12,15 @@
 			
 			<hr />
 			<p><fmt:message key="label.gate.open.single.learner"/></p>
-			<html:form action="/gate?method=openGateForSingleUser" target="_self">
-			<input type="hidden" id="activityId" name="activityId" value="${GateForm.map.activityId}" />
+			<form:form action="openGateForSingleUser.do" id="gateForm" modelAttribute="gateForm" target="_self">
+			<input type="hidden" id="activityId" name="activityId" value="${gateForm.activityId}" />
 			<input type="hidden" id="userId" name="userId" />
 			
 			<div class="row">
 				<div class="col-sm-4">
 					  <p class="text-danger text-center"><strong><fmt:message key="label.gate.list.all.learners"/></strong></p>
 						<div class="panel panel-default gateLearners" id="forbidden">
-							<c:forEach var="learner" items="${GateForm.map.forbiddenLearnerList}">
+							<c:forEach var="learner" items="${gateForm.forbiddenLearnerList}">
 								<input id="forbidden-${learner.userId}" type="checkbox" value="${learner.userId}" />
 								<label for="forbidden-${learner.userId}"><c:out value="${learner.firstName} ${learner.lastName}" escapeXml="true"/></label>
 								<br />
@@ -33,7 +33,7 @@
 				<div class="col-sm-4">
 						<p class="text-center"><strong><fmt:message key="label.gate.list.waiting.learners"/></strong></p>
 						<div class="panel panel-default gateLearners" id="waiting">
-							<c:forEach var="learner" items="${GateForm.map.waitingLearnerList}">
+							<c:forEach var="learner" items="${gateForm.waitingLearnerList}">
 								<input id="waiting-${learner.userId}" type="checkbox" value="${learner.userId}" />
 								<label for="waiting-${learner.userId}"><c:out value="${learner.firstName} ${learner.lastName}" escapeXml="true"/></label>
 								<br />
@@ -46,12 +46,12 @@
 				<div class="col-sm-4">
 							<p class="text-success text-center"><strong><fmt:message key="label.gate.list.allowed.learners"/></strong></p>
 							<div class="panel panel-default gateLearners">
-								<c:forEach var="learner" items="${GateForm.map.allowedToPassLearnerList}">
+								<c:forEach var="learner" items="${gateForm.allowedToPassLearnerList}">
 									<span><c:out value="${learner.firstName} ${learner.lastName}" escapeXml="true"/></span>
 									<br />
 								</c:forEach>
 							</div>
 				</div>
 			</div>
 
-			</html:form>		
+			</form:form>		
Index: lams_monitoring/web/gate/permissionGateContent.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r3eb0caa98564b709116d6e84af92eb3f60c9ff3a
--- lams_monitoring/web/gate/permissionGateContent.jsp	(.../permissionGateContent.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/gate/permissionGateContent.jsp	(.../permissionGateContent.jsp)	(revision 3eb0caa98564b709116d6e84af92eb3f60c9ff3a)
@@ -1,37 +1,68 @@
-	<%@ taglib uri="tags-html" prefix="html" %>
-	<%@ taglib uri="tags-bean" prefix="bean" %>
-	<%@ taglib uri="tags-logic" prefix="logic" %>
-	<%@ taglib uri="tags-core" prefix="c" %>		
-	<%@ taglib uri="tags-fmt" prefix="fmt" %>
-	<%@ taglib uri="tags-lams" prefix="lams" %>
-	
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-	<script type="text/javascript">
-		function allowUsers(who){
-			var allowed = '';
-			$('#' + who + ' input:checked').each(function(){
-				allowed += $(this).val() + ',';
-			});
-			if (allowed == ''){
-				return false;
+<%-- 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2 as 
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+  USA
+
+  http://www.gnu.org/licenses/gpl.txt
+--%>
+<%@ include file="/taglibs.jsp"%>
+
+<!DOCTYPE html>
+<lams:html>
+    <lams:head>
+    	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+		<script type="text/javascript">
+			function allowUsers(who){
+				var allowed = '';
+				$('#' + who + ' input:checked').each(function(){
+					allowed += $(this).val() + ',';
+				});
+				if (allowed == ''){
+					return false;
+				}
+				$('#userId').val(allowed);
+				return true;
 			}
-			$('#userId').val(allowed);
-			return true;
-		}
-	</script>
+		</script>
+		<lams:css/>
+		<fmt:setBundle basename = "org.lamsfoundation.lams.monitoring.MonitoringResources" />
+    </lams:head>
+    
+    <body class="stripes">
+		<c:set var="title"><fmt:message key="label.permission.gate.title"/></c:set>
+		<lams:Page title="${title}" type="monitoring">
+			
+			<%@ include file="gateInfo.jsp" %>
+			
+			<c:if test="${not gateForm.gate.gateOpen}" >
+				<p><fmt:message key="label.gate.you.open.message"/></p>
+			</c:if>
 	
-	<c:set var="title"><fmt:message key="label.permission.gate.title"/></c:set>
-	<lams:Page title="${title}" type="monitoring">
-		
-		<%@ include file="gateInfo.jsp" %>
-		
-		<c:if test="${not GateForm.map.gate.gateOpen}" >
-			<p><fmt:message key="label.gate.you.open.message"/></p>
-		</c:if>
+			<%@ include file="gateStatus.jsp" %>
+			<c:if test="${not gateForm.gate.gateOpen}" >
+						<%@ include file="openGateSingleUser.jsp" %>
+			</c:if>
+	
+		</lams:Page>
 
-		<%@ include file="gateStatus.jsp" %>
-		<c:if test="${not GateForm.map.gate.gateOpen}" >
-					<%@ include file="openGateSingleUser.jsp" %>
-		</c:if>
+		<div id="footer">
+		</div><!--closes footer-->
 
-	</lams:Page>
\ No newline at end of file
+    </body>
+</lams:html>
+
+	
+	
Index: lams_monitoring/web/gate/scheduleGateContent.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r3eb0caa98564b709116d6e84af92eb3f60c9ff3a
--- lams_monitoring/web/gate/scheduleGateContent.jsp	(.../scheduleGateContent.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/gate/scheduleGateContent.jsp	(.../scheduleGateContent.jsp)	(revision 3eb0caa98564b709116d6e84af92eb3f60c9ff3a)
@@ -18,99 +18,109 @@
 
   http://www.gnu.org/licenses/gpl.txt
 --%>
+<%@ include file="/taglibs.jsp"%>
 
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-core" prefix="c" %>		
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-
-	<link type="text/css" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui.timepicker.css" type="text/css" media="screen" />
-	
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.timepicker.js"></script>
-
-	<script type="text/javascript">
-		var shown = true;
+<!DOCTYPE html>
+<lams:html>
+    <lams:head>
+		<lams:css/>
+		<fmt:setBundle basename = "org.lamsfoundation.lams.monitoring.MonitoringResources" />
+		<link type="text/css" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
+		<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui.timepicker.css" type="text/css" media="screen" />
 		
-		$(document).ready(function(){
-			toggleDateWidget();
-			// sets up calendar for schedule date choice
-			$('#scheduleDate').datetimepicker({
-				'minDate' : 0
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.timepicker.js"></script>
+	
+		<script type="text/javascript">
+			var shown = true;
+			
+			$(document).ready(function(){
+				toggleDateWidget();
+				// sets up calendar for schedule date choice
+				$('#scheduleDate').datetimepicker({
+					'minDate' : 0
+				});
 			});
-		});
-		
-		function toggleDateWidget() {
-			if ( shown ) {
-				$('#scheduleDate').hide();	
-				$('#scheduleDatetimeApply').hide();
-				shown = false;
-			} else {
-				$('#scheduleDate').show();	
-				$('#scheduleDatetimeApply').show();
-				shown = true;
+			
+			function toggleDateWidget() {
+				if ( shown ) {
+					$('#scheduleDate').hide();	
+					$('#scheduleDatetimeApply').hide();
+					shown = false;
+				} else {
+					$('#scheduleDate').show();	
+					$('#scheduleDatetimeApply').show();
+					shown = true;
+				}
 			}
-		}
-/* 		
-		function applyDate() {
-			var date = $('#scheduleDatetimeField').val();
-			if (date) {
-				$.ajax({
-					url : LAMS_URL + 'monitoring/gate.do',
-					cache : false,
-					data : {
-						'method'        : ??,
-						'openDate' : date
-					},
-					success : function() {
-						refreshMonitor('lesson');
-					}
-				});
-			} else {
-				alert('<fmt:message key="error.lesson.schedule.date"/>');
+	/* 		
+			function applyDate() {
+				var date = $('#scheduleDatetimeField').val();
+				if (date) {
+					$.ajax({
+						url : LAMS_URL + 'monitoring/gate.do',
+						cache : false,
+						data : {
+							'method'        : ??,
+							'openDate' : date
+						},
+						success : function() {
+							refreshMonitor('lesson');
+						}
+					});
+				} else {
+					alert('<fmt:message key="error.lesson.schedule.date"/>');
+				}
 			}
-		}
- */	</script>
+	 */	</script>
+    </lams:head>
+    
+    <body class="stripes">
+		<c:set var="title"><fmt:message key="label.schedule.gate.title"/></c:set>
+		<lams:Page title="${title}" type="monitoring">
 	
-	<c:set var="title"><fmt:message key="label.schedule.gate.title"/></c:set>
-	<lams:Page title="${title}" type="monitoring">
-
-		<%@ include file="gateInfo.jsp" %>
-		<c:choose>
-			<c:when test="${GateForm.map.activityCompletionBased}">
-				<fmt:message key="label.schedule.gate.activity.completion.based"/>
-			</c:when>
-			<c:otherwise>
-				<c:if test="${not GateForm.map.gate.gateOpen}" >
-					<p><fmt:message key="label.schedule.gate.open.message"/> <lams:Date value="${GateForm.map.startingTime}"/></p>
+			<%@ include file="gateInfo.jsp" %>
+			<c:choose>
+				<c:when test="${gateForm.activityCompletionBased}">
+					<fmt:message key="label.schedule.gate.activity.completion.based"/>
+				</c:when>
+				<c:otherwise>
+					<c:if test="${not gateForm.gate.gateOpen}" >
+						<p><fmt:message key="label.schedule.gate.open.message"/> <lams:Date value="${gateForm.startingTime}"/></p>
+						
+						<form:form action="scheduleGate.do" modelAttribute="gateForm" id="gateForm" target="_self" cssClass="form-inline">
+						<input type="hidden" name="activityId" value="${gateForm.activityId}" />
+	
+						<div class="form-group">
+							<a id="rescheduleShowButton" class="btn btn-default btn-sm" href="#" onClick="javascript:toggleDateWidget()">
+								   <i class="fa fa-calendar"></i>
+								   <fmt:message key="label.reschedule"/>
+							</a>
+							<%-- padding keeps the inputs the same height as the buttons. No flicking when shown/hidden --%>
+							<form:input cssClass="input input-sm" path="scheduleDate" id="scheduleDate" style="vertical-align:bottom"/> 
+							<input type="id" id="scheduleDatetimeApply" class="btn btn-primary btn-sm loffset2" value="<fmt:message key="button.apply"/>" />
+						</div>
+						</form:form>
+					</c:if>
 					
-					<html:form action="/gate?method=scheduleGate" target="_self" styleClass="form-inline">
-					<input type="hidden" name="activityId" value="${GateForm.map.activityId}" />
+					<c:if test="${gateForm.endingTime!=null}">
+						<p><fmt:message key="label.schedule.gate.close.message"/> <lams:Date value="${gateForm.endingTime}"/></p>
+					</c:if>
+					
+					
+				</c:otherwise>
+			</c:choose>
+	
+			<%@ include file="gateStatus.jsp" %>
+	
+		</lams:Page>
 
-					<div class="form-group">
-						<a id="rescheduleShowButton" class="btn btn-default btn-sm" href="#" onClick="javascript:toggleDateWidget()">
-							   <i class="fa fa-calendar"></i>
-							   <fmt:message key="label.reschedule"/>
-						</a>
-						<%-- padding keeps the inputs the same height as the buttons. No flicking when shown/hidden --%>
-						<html:text styleClass="input input-sm" property="scheduleDate" styleId="scheduleDate" style="vertical-align:bottom"/> 
-						<html:submit styleId="scheduleDatetimeApply" styleClass="btn btn-primary btn-sm loffset2"><fmt:message key="button.apply"/></html:submit>
-					</div>
-					</html:form>
-				</c:if>
-				
-				<c:if test="${GateForm.map.endingTime!=null}">
-					<p><fmt:message key="label.schedule.gate.close.message"/> <lams:Date value="${GateForm.map.endingTime}"/></p>
-				</c:if>
-				
-				
-			</c:otherwise>
-		</c:choose>
 
-		<%@ include file="gateStatus.jsp" %>
+		<div id="footer">
+		</div><!--closes footer-->
 
-	</lams:Page>
+    </body>
+</lams:html>
+
+	
Index: lams_monitoring/web/gate/sychGateContent.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r3eb0caa98564b709116d6e84af92eb3f60c9ff3a
--- lams_monitoring/web/gate/sychGateContent.jsp	(.../sychGateContent.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/gate/sychGateContent.jsp	(.../sychGateContent.jsp)	(revision 3eb0caa98564b709116d6e84af92eb3f60c9ff3a)
@@ -18,19 +18,26 @@
 
   http://www.gnu.org/licenses/gpl.txt
 --%>
+<%@ include file="/taglibs.jsp"%>
 
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-core" prefix="c" %>		
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<!DOCTYPE html>
+<lams:html>
+    <lams:head>
+		<lams:css/>
+		<fmt:setBundle basename = "org.lamsfoundation.lams.monitoring.MonitoringResources" />
+    </lams:head>
+    
+    <body class="stripes">
+		<c:set var="title"><fmt:message key="label.synch.gate.title"/></c:set>
+		<lams:Page title="${title}" type="monitoring">
+	
+			<%@ include file="gateInfo.jsp" %>
+			<%@ include file="gateStatus.jsp" %>
+	
+		</lams:Page>
 
-	<c:set var="title"><fmt:message key="label.synch.gate.title"/></c:set>
-	<lams:Page title="${title}" type="monitoring">
+		<div id="footer">
+		</div><!--closes footer-->
 
-		<%@ include file="gateInfo.jsp" %>
-		<%@ include file="gateStatus.jsp" %>
-
-	</lams:Page>
-
+    </body>
+</lams:html>
Index: lams_monitoring/web/grouping/chosenGrouping.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r3eb0caa98564b709116d6e84af92eb3f60c9ff3a
--- lams_monitoring/web/grouping/chosenGrouping.jsp	(.../chosenGrouping.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/grouping/chosenGrouping.jsp	(.../chosenGrouping.jsp)	(revision 3eb0caa98564b709116d6e84af92eb3f60c9ff3a)
@@ -18,12 +18,8 @@
 
   http://www.gnu.org/licenses/gpl.txt
 --%>
-<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<%@ include file="/taglibs.jsp"%>
 
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-
 <!DOCTYPE html>
 <lams:html>
 <lams:head>
Index: lams_monitoring/web/grouping/viewGroups.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r3eb0caa98564b709116d6e84af92eb3f60c9ff3a
--- lams_monitoring/web/grouping/viewGroups.jsp	(.../viewGroups.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/grouping/viewGroups.jsp	(.../viewGroups.jsp)	(revision 3eb0caa98564b709116d6e84af92eb3f60c9ff3a)
@@ -19,13 +19,7 @@
   http://www.gnu.org/licenses/gpl.txt
 --%>
 
-<%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
-<%@ taglib uri="tags-logic" prefix="logic"%>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt"%>
-<%@ taglib uri="tags-function" prefix="fn" %>
-<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ include file="/taglibs.jsp"%>
 <lams:css webapp="monitoring" suffix="monitorLesson"/>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 <lams:Page type="monitor" title="${title}">
Index: lams_monitoring/web/monitor.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r3eb0caa98564b709116d6e84af92eb3f60c9ff3a
--- lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision 3eb0caa98564b709116d6e84af92eb3f60c9ff3a)
@@ -1,9 +1,4 @@
-<%@ page contentType="text/html; charset=utf-8" language="java"%>
-
-<%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="tags-fmt" prefix="fmt"%>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ include file="/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.util.Configuration" import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
 <c:set var="ALLOW_DIRECT_LESSON_LAUNCH"><%=Configuration.get(ConfigurationKeys.ALLOW_DIRECT_LESSON_LAUNCH)%></c:set>
 <c:set var="serverURL"><%=Configuration.get(ConfigurationKeys.SERVER_URL)%></c:set>
Index: lams_monitoring/web/notsupported.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r3eb0caa98564b709116d6e84af92eb3f60c9ff3a
--- lams_monitoring/web/notsupported.jsp	(.../notsupported.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/notsupported.jsp	(.../notsupported.jsp)	(revision 3eb0caa98564b709116d6e84af92eb3f60c9ff3a)
@@ -18,8 +18,20 @@
 
   http://www.gnu.org/licenses/gpl.txt
 --%>
+<%@ include file="/taglibs.jsp"%>
+<!DOCTYPE html>
+<lams:html>
+    <lams:head>
+		<lams:css/>
+		<fmt:setBundle basename = "org.lamsfoundation.lams.monitoring.MonitoringResources" />
+    </lams:head>
+    
+    <body class="stripes">
+		<H1><fmt:message key="not.supported"/></H1>
+		
+		<div id="footer">
+		</div><!--closes footer-->
 
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-core" prefix="c" %>
+    </body>
+</lams:html>
 
-	<H1><fmt:message key="not.supported"/></H1>
Index: lams_monitoring/web/parallelProgress.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r3eb0caa98564b709116d6e84af92eb3f60c9ff3a
--- lams_monitoring/web/parallelProgress.jsp	(.../parallelProgress.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/parallelProgress.jsp	(.../parallelProgress.jsp)	(revision 3eb0caa98564b709116d6e84af92eb3f60c9ff3a)
@@ -1,8 +1,6 @@
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-
 <!DOCTYPE html>
+
+<%@ include file="/taglibs.jsp"%>
 <lams:html>
    
 <lams:head></lams:head>
Index: lams_monitoring/web/previewdeleted.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r3eb0caa98564b709116d6e84af92eb3f60c9ff3a
--- lams_monitoring/web/previewdeleted.jsp	(.../previewdeleted.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/previewdeleted.jsp	(.../previewdeleted.jsp)	(revision 3eb0caa98564b709116d6e84af92eb3f60c9ff3a)
@@ -19,12 +19,7 @@
   http://www.gnu.org/licenses/gpl.txt
 --%>
 
-<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
-
-<%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ include file="/taglibs.jsp"%>
 <!DOCTYPE html>
 <lams:html xhtml="true">
 
Index: lams_monitoring/web/systemErrorContent.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r3eb0caa98564b709116d6e84af92eb3f60c9ff3a
--- lams_monitoring/web/systemErrorContent.jsp	(.../systemErrorContent.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/systemErrorContent.jsp	(.../systemErrorContent.jsp)	(revision 3eb0caa98564b709116d6e84af92eb3f60c9ff3a)
@@ -18,24 +18,34 @@
 
   http://www.gnu.org/licenses/gpl.txt
 --%>
+<%@ include file="/taglibs.jsp"%>
 
-<!-- taglib definition-->
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
+<!DOCTYPE html>
+<lams:html>
+    <lams:head>
+		<lams:css/>
+		<fmt:setBundle basename = "org.lamsfoundation.lams.monitoring.MonitoringResources" />
+    </lams:head>
+    
+    <body class="stripes">
+		<tr>
+			<td>
+				<table width="100%" height="190" border="0" align="center" cellpadding="5" cellspacing="0" bgcolor="#FFFFFF" summary="This table is being used for layout purposes only">
+					<tr> 
+						<td height="138" valign="top"> 
+						 <table width="90%" border="0" cellspacing="0" cellpadding="0">
+						 	<br/>
+							<br/>
+		   					<%@ include file="errorbox.jsp" %>
+						 </table>
+						</td>
+					 </tr>
+				</table>
+			</td>
+		</tr>
+		<div id="footer">
+		</div><!--closes footer-->
 
-<!-- end of taglib definition -->
-<tr>
-	<td>
-		<table width="100%" height="190" border="0" align="center" cellpadding="5" cellspacing="0" bgcolor="#FFFFFF" summary="This table is being used for layout purposes only">
-			<tr> 
-				<td height="138" valign="top"> 
-				 <table width="90%" border="0" cellspacing="0" cellpadding="0">
-				 	<br/>
-					<br/>
-   					<%@ include file="errorbox.jsp" %>
-				 </table>
-				</td>
-			 </tr>
-		</table>
-	</td>
-</tr>
+    </body>
+</lams:html>
+
Index: lams_monitoring/web/template/taglibs.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r3eb0caa98564b709116d6e84af92eb3f60c9ff3a
--- lams_monitoring/web/template/taglibs.jsp	(.../taglibs.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/template/taglibs.jsp	(.../taglibs.jsp)	(revision 3eb0caa98564b709116d6e84af92eb3f60c9ff3a)
@@ -1,8 +1,5 @@
-<%@ page contentType="text/html; charset=utf-8" language="java"%>
-<%@ taglib uri="tags-tiles" prefix="tiles" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ page contentType="text/html; charset=utf-8" language="java" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-function" prefix="fn" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
Index: lams_monitoring/web/timer.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r3eb0caa98564b709116d6e84af92eb3f60c9ff3a
--- lams_monitoring/web/timer.jsp	(.../timer.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/timer.jsp	(.../timer.jsp)	(revision 3eb0caa98564b709116d6e84af92eb3f60c9ff3a)
@@ -1,7 +1,5 @@
 <!DOCTYPE html>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ include file="/taglibs.jsp"%>
 
 <c:set var="title"><fmt:message key="label.countdown.timer"></fmt:message></c:set>
 <c:set var="lams"><lams:LAMSURL /></c:set>
Index: lams_monitoring/web/viewSequence.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r3eb0caa98564b709116d6e84af92eb3f60c9ff3a
--- lams_monitoring/web/viewSequence.jsp	(.../viewSequence.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/viewSequence.jsp	(.../viewSequence.jsp)	(revision 3eb0caa98564b709116d6e84af92eb3f60c9ff3a)
@@ -1,4 +1,4 @@
-	<%-- 
+<%-- 
 Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 License Information: http://lamsfoundation.org/licensing/lams/2.0/
 
@@ -18,31 +18,37 @@
 
   http://www.gnu.org/licenses/gpl.txt
 --%>
-<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<%@ include file="/taglibs.jsp"%>
+<!DOCTYPE html>
+<lams:html>
+    <lams:head>
+		<lams:css/>
+		<fmt:setBundle basename = "org.lamsfoundation.lams.monitoring.MonitoringResources" />
+    </lams:head>
+    
+    <body class="stripes">
+		<h1><c:out value="${title}"/></h1>
+		
+			<table class="alternative-color" cellspacing="0">
+				<c:forEach items="${learners}" var="learner">
+				<tr>
+					<td>
+						<c:out value="${learner.firstName}"/> <c:out value="${learner.lastName}"/><BR>
+					</td>
+				</tr>
+				</c:forEach>
+			</table>
+				
+			<c:if test="${not localFiles}">
+				<%@ include file="../template/finishbutton.jsp" %>
+			</c:if>
+		</div>  <!--closes content-->
 
-<%@ taglib uri="tags-tiles" prefix="tiles" %>
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+		<div id="footer">
+		</div><!--closes footer-->
 
+    </body>
+</lams:html>
+
 <div id="content">
 
-	<h1><c:out value="${title}"/></h1>
-
-	<table class="alternative-color" cellspacing="0">
-		<c:forEach items="${learners}" var="learner">
-		<tr>
-			<td>
-				<c:out value="${learner.firstName}"/> <c:out value="${learner.lastName}"/><BR>
-			</td>
-		</tr>
-		</c:forEach>
-	</table>
-		
-	<c:if test="${not localFiles}">
-		<%@ include file="../template/finishbutton.jsp" %>
-	</c:if>
-</div>  <!--closes content-->
-
-