Index: lams_monitoring/web/monitor.jsp
===================================================================
diff -u -r44f25ff763552baf103b1bb4ed7d1d2466a937dc -rbddec51eae5eadd831676c4ea28eadcf446c32bd
--- lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision 44f25ff763552baf103b1bb4ed7d1d2466a937dc)
+++ lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision bddec51eae5eadd831676c4ea28eadcf446c32bd)
@@ -267,14 +267,12 @@
         }
 
         function switchToTblMonitor() {
-			$("#content").load(
-				"<c:url value='tblmonitor/start.do'/>",
-				{
-					lessonID: ${lesson.lessonID}
-				}
-			);
-    		}
-
+        	$("#content").load(LAMS_URL + 'monitoring/tblmonitor/start.do', 
+        	{
+        		lessonID: ${lesson.lessonID}
+        	});
+        }
+        
     	<%@ include file="monitorTour.jsp" %> 
 
 	</script>
Index: lams_monitoring/web/tblmonitor/forum.jsp
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rbddec51eae5eadd831676c4ea28eadcf446c32bd
--- lams_monitoring/web/tblmonitor/forum.jsp	(.../forum.jsp)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_monitoring/web/tblmonitor/forum.jsp	(.../forum.jsp)	(revision bddec51eae5eadd831676c4ea28eadcf446c32bd)
@@ -1,4 +1,4 @@
-<%@ include file="/template/taglibs.jsp"%>
+<%@ include file="/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.util.CommonConstants"%>
 <script>
 	$(document).ready(function(){
Index: lams_monitoring/web/tblmonitor/gates.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rbddec51eae5eadd831676c4ea28eadcf446c32bd
--- lams_monitoring/web/tblmonitor/gates.jsp	(.../gates.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/tblmonitor/gates.jsp	(.../gates.jsp)	(revision bddec51eae5eadd831676c4ea28eadcf446c32bd)
@@ -1,4 +1,4 @@
-<%@ include file="/template/taglibs.jsp"%>
+<%@ 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>
Index: lams_monitoring/web/tblmonitor/peerreview.jsp
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rbddec51eae5eadd831676c4ea28eadcf446c32bd
--- lams_monitoring/web/tblmonitor/peerreview.jsp	(.../peerreview.jsp)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_monitoring/web/tblmonitor/peerreview.jsp	(.../peerreview.jsp)	(revision bddec51eae5eadd831676c4ea28eadcf446c32bd)
@@ -1,4 +1,4 @@
-<%@ include file="/template/taglibs.jsp"%>
+<%@ include file="/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.util.CommonConstants"%>
 <script>
 	$(document).ready(function(){
Index: lams_monitoring/web/tblmonitor/sequence.jsp
===================================================================
diff -u -r388b3abd9fd8b750b4fbb12028fa856a0a11249e -rbddec51eae5eadd831676c4ea28eadcf446c32bd
--- lams_monitoring/web/tblmonitor/sequence.jsp	(.../sequence.jsp)	(revision 388b3abd9fd8b750b4fbb12028fa856a0a11249e)
+++ lams_monitoring/web/tblmonitor/sequence.jsp	(.../sequence.jsp)	(revision bddec51eae5eadd831676c4ea28eadcf446c32bd)
@@ -1,4 +1,4 @@
-<%@ include file="/template/taglibs.jsp"%>
+<%@ include file="/taglibs.jsp"%>
 
 <lams:css webapp="monitoring" suffix="monitorLesson"/>
 <style>
@@ -171,10 +171,9 @@
 	        var method = (lessonStateId == 3) ? "suspendLesson.do" : "unsuspendLesson.do";
 			$.ajax({
 				dataType : 'xml',
-				url : LAMS_URL + 'monitoring/monitoring/',
+				url : LAMS_URL + 'monitoring/monitoring/'+method,
 				cache : false,
 				data : {
-					'method'    : method,
 					'lessonID'  : '${lesson.lessonId}'
 				},
 				success : function() {
Index: lams_monitoring/web/tblmonitor/tblmonitor.jsp
===================================================================
diff -u -rd662ddfeccbdb0b0449031cf7496c36f64155b52 -rbddec51eae5eadd831676c4ea28eadcf446c32bd
--- lams_monitoring/web/tblmonitor/tblmonitor.jsp	(.../tblmonitor.jsp)	(revision d662ddfeccbdb0b0449031cf7496c36f64155b52)
+++ lams_monitoring/web/tblmonitor/tblmonitor.jsp	(.../tblmonitor.jsp)	(revision bddec51eae5eadd831676c4ea28eadcf446c32bd)
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 
-<%@ include file="/template/taglibs.jsp"%>
+<%@ include file="/taglibs.jsp"%>
 
 <lams:html>
 <lams:head>
@@ -52,7 +52,7 @@
 		});
 
 		function loadTab(method, toolContentID) {
-			var url = "<c:url value='tblmonitor.do'/>";
+			var url = "<lams:LAMSURL/>monitoring/tblmonitor/"
 			var options = {};
 			
 			if (method == "tra" || method == "traStudentChoices" || method == "burningQuestions") {
@@ -84,9 +84,9 @@
 				url = "<lams:LAMSURL/>tool/laprev11/tblmonitoring/";
 			}
 
-			// Merge additional options into existing options object
+			// Merge additional options into existing options object, convert method to url call
+			url = url+method+".do";
 			$.extend( options, {
-				method: method,
 				lessonID: ${lesson.lessonId},
 				toolContentID: toolContentID
 			});
@@ -167,7 +167,6 @@
 			</div>
 
 			<table class="tablesorter">
-				<c:set var="actionUrl"><c:url value='tblmonitor.do'/></c:set>
 				<tr>
 					<td id="menu-item-teams">
 						<a id="tab-link-teams" class="tab-link" href="#teams" data-method="teams">
@@ -293,7 +292,7 @@
 						<i class="fa fa-refresh"></i><span class="hidden-xs">  <fmt:message key="button.refresh"/></span>
 					</button>
 					
-					<button id="timer-button" type="button" class="btn btn-sm btn-default pull-right"  onclick="javascript:openPopUp('timer.jsp', '<fmt:message key="label.countdown.timer"/>', 648, 1152, true);return false;" style="margin-right: 10px;">
+					<button id="timer-button" type="button" class="btn btn-sm btn-default pull-right"  onclick="javascript:openPopUp('<lams:LAMSURL/>monitoring/timer.jsp', '<fmt:message key="label.countdown.timer"/>', 648, 1152, true);return false;" style="margin-right: 10px;">
 							<i class="fa fa-hourglass-half"></i><span class="hidden-xs"> <fmt:message key="label.countdown.timer"/></span>
 					</button>		
 				</div>
Index: lams_monitoring/web/tblmonitor/teams.jsp
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rbddec51eae5eadd831676c4ea28eadcf446c32bd
--- lams_monitoring/web/tblmonitor/teams.jsp	(.../teams.jsp)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_monitoring/web/tblmonitor/teams.jsp	(.../teams.jsp)	(revision bddec51eae5eadd831676c4ea28eadcf446c32bd)
@@ -1,4 +1,4 @@
-<%@ include file="/template/taglibs.jsp"%>
+<%@ include file="/taglibs.jsp"%>
 <style>
 	.font-weight-bold {
 		font-weight: bold;
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rbddec51eae5eadd831676c4ea28eadcf446c32bd
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision bddec51eae5eadd831676c4ea28eadcf446c32bd)
@@ -1645,7 +1645,7 @@
 		    }
 		} else {
 		    averageRow = new ExcelCell[9];
-		    averageRow[6] = new ExcelCell(getMessage("label.	.average"), true);
+		    averageRow[6] = new ExcelCell(getMessage("label.export.average"), true);
 
 		    if (timeTakenTotal > 0) {
 			averageRow[7] = new ExcelCell(new Long(timeTakenTotal / timeTakenCount), false);
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/TblMonitoringController.java
===================================================================
diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -rbddec51eae5eadd831676c4ea28eadcf446c32bd
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/TblMonitoringController.java	(.../TblMonitoringController.java)	(revision f2ad75cef0c507a64877942631fee13efbc6ed50)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/TblMonitoringController.java	(.../TblMonitoringController.java)	(revision bddec51eae5eadd831676c4ea28eadcf446c32bd)
@@ -19,7 +19,7 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 @Controller
-@RequestMapping("/TblMonitoring")
+@RequestMapping("/tblmonitoring")
 public class TblMonitoringController {
     private static Logger log = Logger.getLogger(TblMonitoringController.class);