Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/MonitoringController.java
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -r13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d)
@@ -519,7 +519,7 @@
 
 	request.setAttribute(DacoConstants.ATTR_SESSION_SUMMARIES, sessList);
 	request.setAttribute(DacoConstants.ATTR_SESSION_MAP_ID, sessionMapID);
-	return "statistic";
+	return "pages/monitoring/statistics";
     }
 
 }
Index: lams_tool_daco/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -r13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d
--- lams_tool_daco/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_daco/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d)
@@ -435,4 +435,4 @@
 		</div>
 		</div>
 	</c:otherwise>
-</c:choose>
\ No newline at end of file
+</c:choose>
Index: lams_tool_daco/web/pages/authoring/basic.jsp
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -r13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d
--- lams_tool_daco/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_daco/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d)
@@ -44,7 +44,7 @@
 	
 	
 	function editQuestion(questionIndex,sessionMapID){
-		var url = "<c:url value="/authoring/editQuestion.do?questionIndex="/>" + questionIndex +"&reqID="+(new Date()).getTime()+"&sessionMapID="+sessionMapID;
+		var url = '<c:url value="/authoring/editQuestion.do?questionIndex="/>' + questionIndex +"&reqID="+(new Date()).getTime()+"&sessionMapID="+sessionMapID;
 		showQuestionInputArea(url);
 	}
 	
Index: lams_tool_daco/web/pages/authoring/parts/addcheckbox.jsp
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -r13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d
--- lams_tool_daco/web/pages/authoring/parts/addcheckbox.jsp	(.../addcheckbox.jsp)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_daco/web/pages/authoring/parts/addcheckbox.jsp	(.../addcheckbox.jsp)	(revision 13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d)
@@ -29,7 +29,7 @@
 
 <!-- Add question form-->
 <%@ include file="/common/messages.jsp"%>
-<form:form action="authoring/saveOrUpdateQuestion.do" modelAttribute="questionForm" method="post" id="dacoQuestionForm">
+<form:form action="saveOrUpdateQuestion.do" modelAttribute="questionForm" method="post" id="dacoQuestionForm">
 	<form:hidden path="sessionMapID" />
 	<input type="hidden" id="questionType" name="questionType" value="9" />
 	<form:hidden path="questionIndex" />
Index: lams_tool_daco/web/pages/authoring/parts/adddate.jsp
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -r13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d
--- lams_tool_daco/web/pages/authoring/parts/adddate.jsp	(.../adddate.jsp)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_daco/web/pages/authoring/parts/adddate.jsp	(.../adddate.jsp)	(revision 13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d)
@@ -27,7 +27,7 @@
 
 <!-- Add question form-->
 <%@ include file="/common/messages.jsp"%>
-<form:form action="authoring/saveOrUpdateQuestion.do" modelAttribute="questionForm" method="post" id="dacoQuestionForm">
+<form:form action="saveOrUpdateQuestion.do" modelAttribute="questionForm" method="post" id="dacoQuestionForm">
 	<form:hidden path="sessionMapID" />
 	<input type="hidden" id="questionType" name="questionType" value="4" />
 	<form:hidden path="questionIndex" />
Index: lams_tool_daco/web/pages/authoring/parts/adddropdown.jsp
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -r13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d
--- lams_tool_daco/web/pages/authoring/parts/adddropdown.jsp	(.../adddropdown.jsp)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_daco/web/pages/authoring/parts/adddropdown.jsp	(.../adddropdown.jsp)	(revision 13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d)
@@ -29,7 +29,7 @@
 
 <!-- Add question form-->
 <%@ include file="/common/messages.jsp"%>
-<form:form action="authoring/saveOrUpdateQuestion.do" modelAttribute="questionForm" method="post" styleId="dacoQuestionForm">
+<form:form action="saveOrUpdateQuestion.do" modelAttribute="questionForm" method="post" styleId="dacoQuestionForm">
 	<form:hidden path="sessionMapID" />
 	<input type="hidden" id="questionType" name="questionType" value="8" />
 	<form:hidden path="questionIndex" />
Index: lams_tool_daco/web/pages/authoring/parts/addfile.jsp
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -r13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d
--- lams_tool_daco/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_daco/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision 13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d)
@@ -27,7 +27,7 @@
 
 <!-- Add question form-->
 <%@ include file="/common/messages.jsp"%>
-<form:form action="authoring/saveOrUpdateQuestion.do" modelAttribute="questionForm" method="post" id="dacoQuestionForm">
+<form:form action="saveOrUpdateQuestion.do" modelAttribute="questionForm" method="post" id="dacoQuestionForm">
 	<form:hidden path="sessionMapID" />
 	<input type="hidden" id="questionType" name="questionType" value="5" />
 	<form:hidden path="questionIndex" />
Index: lams_tool_daco/web/pages/authoring/parts/addimage.jsp
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -r13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d
--- lams_tool_daco/web/pages/authoring/parts/addimage.jsp	(.../addimage.jsp)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_daco/web/pages/authoring/parts/addimage.jsp	(.../addimage.jsp)	(revision 13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d)
@@ -27,7 +27,7 @@
 
 <!-- Add question form-->
 <%@ include file="/common/messages.jsp"%>
-<form:form action="authoring/saveOrUpdateQuestiondo" modelAttribute="questionForm" method="post" id="dacoQuestionForm">
+<form:form action="saveOrUpdateQuestion.do" modelAttribute="questionForm" method="post" id="dacoQuestionForm">
 	<form:hidden path="sessionMapID" />
 	<input type="hidden" id="questionType" name="questionType" value="6" />
 	<form:hidden path="questionIndex" />
Index: lams_tool_daco/web/pages/authoring/parts/addlonglat.jsp
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -r13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d
--- lams_tool_daco/web/pages/authoring/parts/addlonglat.jsp	(.../addlonglat.jsp)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_daco/web/pages/authoring/parts/addlonglat.jsp	(.../addlonglat.jsp)	(revision 13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d)
@@ -29,7 +29,7 @@
 
 <!-- Add question form-->
 <%@ include file="/common/messages.jsp"%>
-<form:form action="authoring/saveOrUpdateQuestion.do" modelAttribute="questionForm" method="post" id="dacoQuestionForm">
+<form:form action="saveOrUpdateQuestion.do" modelAttribute="questionForm" method="post" id="dacoQuestionForm">
 	<form:hidden path="sessionMapID" />
 	<input type="hidden" id="questionType" name="questionType" value="10" />
 	<form:hidden path="questionIndex" />
Index: lams_tool_daco/web/pages/authoring/parts/addnumber.jsp
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -r13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d
--- lams_tool_daco/web/pages/authoring/parts/addnumber.jsp	(.../addnumber.jsp)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_daco/web/pages/authoring/parts/addnumber.jsp	(.../addnumber.jsp)	(revision 13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d)
@@ -27,7 +27,7 @@
 
 <!-- Add question form-->
 <%@ include file="/common/messages.jsp"%>
-<form:form action="authoring/saveOrUpdateQuestion.do" modelAttribute="questionForm" method="post" id="dacoQuestionForm">
+<form:form action="saveOrUpdateQuestion.do" modelAttribute="questionForm" method="post" id="dacoQuestionForm">
 	<form:hidden path="sessionMapID" />
 	<input type="hidden" id="questionType" name="questionType" value="3" />
 	<form:hidden path="questionIndex" />
Index: lams_tool_daco/web/pages/authoring/parts/addradio.jsp
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -r13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d
--- lams_tool_daco/web/pages/authoring/parts/addradio.jsp	(.../addradio.jsp)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_daco/web/pages/authoring/parts/addradio.jsp	(.../addradio.jsp)	(revision 13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d)
@@ -29,7 +29,7 @@
 
 <!-- Add question form-->
 <%@ include file="/common/messages.jsp"%>
-<form:form action="authoring/saveOrUpdateQuestion.do" modelAttribute="questionForm" method="post" id="dacoQuestionForm">
+<form:form action="saveOrUpdateQuestion.do" modelAttribute="questionForm" method="post" id="dacoQuestionForm">
 	<form:hidden path="sessionMapID" />
 	<input type="hidden" id="questionType" name="questionType" value="7" />
 	<form:hidden path="questionIndex" />
Index: lams_tool_daco/web/pages/authoring/parts/addtextarea.jsp
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -r13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d
--- lams_tool_daco/web/pages/authoring/parts/addtextarea.jsp	(.../addtextarea.jsp)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_daco/web/pages/authoring/parts/addtextarea.jsp	(.../addtextarea.jsp)	(revision 13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d)
@@ -27,7 +27,7 @@
 
 <!-- Add question form-->
 <%@ include file="/common/messages.jsp"%>
-<form:form action="authoring/saveOrUpdateQuestion.do" modelAttribute="questionForm" method="post" id="dacoQuestionForm">
+<form:form action="saveOrUpdateQuestion.do" modelAttribute="questionForm" method="post" id="dacoQuestionForm">
 	<form:hidden path="sessionMapID" />
 	<input type="hidden" id="questionType" name="questionType" value="2" />
 	<form:hidden path="questionIndex" />
Index: lams_tool_daco/web/pages/authoring/parts/addtextfield.jsp
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -r13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d
--- lams_tool_daco/web/pages/authoring/parts/addtextfield.jsp	(.../addtextfield.jsp)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_daco/web/pages/authoring/parts/addtextfield.jsp	(.../addtextfield.jsp)	(revision 13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d)
@@ -28,7 +28,7 @@
 <!-- Add question form-->
 <%@ include file="/common/messages.jsp"%>
 
-<form:form action="authoring/saveOrUpdateQuestion.do" modelAttribute="questionForm" method="post" id="dacoQuestionForm">
+<form:form action="saveOrUpdateQuestion.do" modelAttribute="questionForm" method="post" id="dacoQuestionForm">
 	<form:hidden path="sessionMapID" />
 	<input type="hidden" id="questionType" name="questionType" value="1" />
 	<form:hidden path="questionIndex" />
Index: lams_tool_daco/web/pages/authoring/parts/answeroptions.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d
--- lams_tool_daco/web/pages/authoring/parts/answeroptions.jsp	(.../answeroptions.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_daco/web/pages/authoring/parts/answeroptions.jsp	(.../answeroptions.jsp)	(revision 13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d)
@@ -28,7 +28,7 @@
  			</c:if>
 			<!-- Don't display down icon if last line -->
 			<c:if test="${not status.last}">
-				<lams:Arrow state="down" title="<fmt:message key='label.authoring.basic.answeroption.down'/>" onclick="javascript:downItem('${status.index+1}','${listSize}')"/>
+				<lams:Arrow state="down" title="<fmt:message key='label.authoring.basic.answeroption.down'/>" onclick="javascript:downItem('${status.index+1}','${listSize+1}')"/>
  			</c:if>
 			</td>
 			<!-- Don't display remove icon if there is less than 2 answer options -->
Index: lams_tool_daco/web/pages/authoring/parts/description.jsp
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -r13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d
--- lams_tool_daco/web/pages/authoring/parts/description.jsp	(.../description.jsp)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_daco/web/pages/authoring/parts/description.jsp	(.../description.jsp)	(revision 13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d)
@@ -1,7 +1,7 @@
-	<c:set var="sessionMap" value="${sessionScope[authoringForm.sessionMapID]}" />
+	<c:set var="sessionMap" value="${sessionScope[questionForm.sessionMapID]}" />
 	<div class="form-group">
     	<label for="description"><fmt:message key="label.authoring.basic.description" /></label>
-		<lams:CKEditor id="description" value="${authoringForm.description}" 
+		<lams:CKEditor id="description" value="${questionForm.description}" 
 			contentFolderID="${sessionMap.contentFolderID}"
 	                width="100%"
 	                resizeParentFrameName="questionInputArea">