Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringConditionController.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5f5d164117e56516c294f276bbaa4a33e2108372
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringConditionController.java	(.../QaAuthoringConditionController.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringConditionController.java	(.../QaAuthoringConditionController.java)	(revision 5f5d164117e56516c294f276bbaa4a33e2108372)
@@ -49,6 +49,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
@@ -78,7 +79,7 @@
      * @return
      */
     @RequestMapping("/newConditionInit")
-    private String newConditionInit(QaConditionForm QaConditionForm, HttpServletRequest request) {
+    private String newConditionInit(@ModelAttribute QaConditionForm QaConditionForm, HttpServletRequest request) {
 
 	populateFormWithPossibleItems(QaConditionForm, request);
 	QaConditionForm.setOrderId(-1);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaController.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5f5d164117e56516c294f276bbaa4a33e2108372
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaController.java	(.../QaController.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaController.java	(.../QaController.java)	(revision 5f5d164117e56516c294f276bbaa4a33e2108372)
@@ -75,6 +75,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
@@ -101,28 +102,28 @@
     }
     
     @RequestMapping("/authoring")
-    public String execute(QaAuthoringForm qaAuthoringForm, HttpServletRequest request) throws IOException, ServletException, QaApplicationException {
+    public String execute(@ModelAttribute QaAuthoringForm authoringForm, HttpServletRequest request) throws IOException, ServletException, QaApplicationException {
 
 	QaUtils.cleanUpSessionAbsolute(request);
 
 	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	qaAuthoringForm.setContentFolderID(contentFolderID);
+	authoringForm.setContentFolderID(contentFolderID);
 
-	qaAuthoringForm.resetRadioBoxes();
+	authoringForm.resetRadioBoxes();
 
-	validateDefaultContent(request, qaAuthoringForm);
+	validateDefaultContent(request, authoringForm);
 
 	//no problems getting the default content, will render authoring screen
 	String strToolContentID = "";
 	/* the authoring url must be passed a tool content id */
 	strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
-	qaAuthoringForm.setToolContentID(strToolContentID);
+	authoringForm.setToolContentID(strToolContentID);
 
 	SessionMap<String, Object> sessionMap = new SessionMap<>();
 	sessionMap.put(QaAppConstants.ACTIVITY_TITLE_KEY, "");
 	sessionMap.put(QaAppConstants.ACTIVITY_INSTRUCTIONS_KEY, "");
 	sessionMap.put(AttributeNames.PARAM_CONTENT_FOLDER_ID, contentFolderID);
-	qaAuthoringForm.setHttpSessionID(sessionMap.getSessionID());
+	authoringForm.setHttpSessionID(sessionMap.getSessionID());
 
 	if (strToolContentID == null || strToolContentID.equals("")) {
 	    QaUtils.cleanUpSessionAbsolute(request);
@@ -137,7 +138,7 @@
 	    qaContent = QaContent.newInstance(qaContent, new Long(strToolContentID));
 	}
 
-	prepareDTOandForm(request, qaAuthoringForm, qaContent, qaService, sessionMap);
+	prepareDTOandForm(request, authoringForm, qaContent, qaService, sessionMap);
 
 	ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request);
 	// request is from monitoring module
@@ -150,15 +151,16 @@
 	conditionList.clear();
 	conditionList.addAll(qaContent.getConditions());
 
-	qaAuthoringForm.setAllowRichEditor(qaContent.isAllowRichEditor());
-	qaAuthoringForm.setUseSelectLeaderToolOuput(qaContent.isUseSelectLeaderToolOuput());
+	authoringForm.setAllowRichEditor(qaContent.isAllowRichEditor());
+	authoringForm.setUseSelectLeaderToolOuput(qaContent.isUseSelectLeaderToolOuput());
 
-	sessionMap.put(QaAppConstants.ATTR_QA_AUTHORING_FORM, qaAuthoringForm);
+	sessionMap.put(QaAppConstants.ATTR_QA_AUTHORING_FORM, authoringForm);
 	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
 
 	// get rating criterias from DB
 	List<RatingCriteria> ratingCriterias = qaService.getRatingCriterias(qaContent.getQaContentId());
 	sessionMap.put(AttributeNames.ATTR_RATING_CRITERIAS, ratingCriterias);
+	request.setAttribute("authoringForm", authoringForm);
 
 	return "authoring/AuthoringTabsHolder";
     }
@@ -242,7 +244,7 @@
      * @param mapping
      * @return ActionForward
      */
-    public boolean validateDefaultContent(HttpServletRequest request, QaAuthoringForm qaAuthoringForm) {
+    public boolean validateDefaultContent(HttpServletRequest request, QaAuthoringForm authoringForm) {
 
 	/*
 	 * retrieve the default content id based on tool signature
@@ -306,15 +308,15 @@
      * submits content into the tool database
      */
     @RequestMapping("/submitAllContent")
-    public String submitAllContent(QaAuthoringForm qaAuthoringForm, HttpServletRequest request)
+    public String submitAllContent(QaAuthoringForm authoringForm, HttpServletRequest request)
 	    throws IOException, ServletException {
 
-	String httpSessionID = qaAuthoringForm.getHttpSessionID();
+	String httpSessionID = authoringForm.getHttpSessionID();
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
 		.getAttribute(httpSessionID);
 
 	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	qaAuthoringForm.setContentFolderID(contentFolderID);
+	authoringForm.setContentFolderID(contentFolderID);
 
 	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
 	Long toolContentID = new Long(strToolContentID);
@@ -329,8 +331,8 @@
 	String richTextTitle = request.getParameter(QaAppConstants.TITLE);
 	String richTextInstructions = request.getParameter(QaAppConstants.INSTRUCTIONS);
 
-	qaAuthoringForm.setTitle(richTextTitle);
-	qaAuthoringForm.setInstructions(richTextInstructions);
+	authoringForm.setTitle(richTextTitle);
+	authoringForm.setInstructions(richTextInstructions);
 
 	sessionMap.put(QaAppConstants.ACTIVITY_TITLE_KEY, richTextTitle);
 	sessionMap.put(QaAppConstants.ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
@@ -392,13 +394,13 @@
 		    .get(AttributeNames.ATTR_RATING_CRITERIAS);
 	    qaService.saveRatingCriterias(request, oldCriterias, toolContentID);
 
-	    QaUtils.setFormProperties(request, qaAuthoringForm, strToolContentID, httpSessionID);
+	    QaUtils.setFormProperties(request, authoringForm, strToolContentID, httpSessionID);
 
 	    request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 
 	} else {
 	    if (qaContent != null) {
-		QaUtils.setFormProperties(request, qaAuthoringForm, strToolContentID, httpSessionID);
+		QaUtils.setFormProperties(request, authoringForm, strToolContentID, httpSessionID);
 	    }
 	}
 
@@ -410,15 +412,16 @@
 	    qaService.deleteCondition(condition);
 	}
 
-	qaAuthoringForm.resetUserAction();
-	qaAuthoringForm.setToolContentID(strToolContentID);
-	qaAuthoringForm.setHttpSessionID(httpSessionID);
-	qaAuthoringForm.setCurrentTab("1");
+	authoringForm.resetUserAction();
+	authoringForm.setToolContentID(strToolContentID);
+	authoringForm.setHttpSessionID(httpSessionID);
+	authoringForm.setCurrentTab("1");
 
 	request.setAttribute(QaAppConstants.LIST_QUESTION_DTOS, questionDTOs);
 	request.getSession().setAttribute(httpSessionID, sessionMap);
 	request.setAttribute(QaAppConstants.TOTAL_QUESTION_COUNT, new Integer(questionDTOs.size()));
 	sessionMap.put(QaAppConstants.LIST_QUESTION_DTOS, questionDTOs);
+	request.setAttribute("authoringForm", authoringForm);
 
 	return "authoring/AuthoringTabsHolder";
     }
@@ -599,16 +602,16 @@
      * saveSingleQuestion
      */
     @RequestMapping("/saveSingleQuestion")
-    public String saveSingleQuestion(QaAuthoringForm qaAuthoringForm, HttpServletRequest request)
+    public String saveSingleQuestion(@ModelAttribute("newQuestionForm")QaAuthoringForm newQuestionForm, HttpServletRequest request)
 	    throws IOException, ServletException {
 
-	String httpSessionID = qaAuthoringForm.getHttpSessionID();
+	String httpSessionID = newQuestionForm.getHttpSessionID();
 
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
 		.getAttribute(httpSessionID);
 
 	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	qaAuthoringForm.setContentFolderID(contentFolderID);
+	newQuestionForm.setContentFolderID(contentFolderID);
 
 	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
 
@@ -696,39 +699,40 @@
 	String richTextTitle = request.getParameter(QaAppConstants.TITLE);
 	String richTextInstructions = request.getParameter(QaAppConstants.INSTRUCTIONS);
 
-	qaAuthoringForm.setTitle(richTextTitle);
-	qaAuthoringForm.setInstructions(richTextInstructions);
+	newQuestionForm.setTitle(richTextTitle);
+	newQuestionForm.setInstructions(richTextInstructions);
 
 	sessionMap.put(QaAppConstants.ACTIVITY_TITLE_KEY, richTextTitle);
 	sessionMap.put(QaAppConstants.ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
 
 	request.getSession().setAttribute(httpSessionID, sessionMap);
 
-	QaUtils.setFormProperties(request, qaAuthoringForm, strToolContentID, httpSessionID);
+	QaUtils.setFormProperties(request, newQuestionForm, strToolContentID, httpSessionID);
 
-	qaAuthoringForm.setToolContentID(strToolContentID);
-	qaAuthoringForm.setHttpSessionID(httpSessionID);
-	qaAuthoringForm.setCurrentTab("1");
+	newQuestionForm.setToolContentID(strToolContentID);
+	newQuestionForm.setHttpSessionID(httpSessionID);
+	newQuestionForm.setCurrentTab("1");
 
 	request.getSession().setAttribute(httpSessionID, sessionMap);
 	request.setAttribute(QaAppConstants.TOTAL_QUESTION_COUNT, new Integer(questionDTOs.size()));
+	request.setAttribute("authoringForm", newQuestionForm);
 	return "authoring/AuthoringTabsHolder";
     }
 
     /**
      * addSingleQuestion
      */
     @RequestMapping("/addSingleQuestion")
-    public String addSingleQuestion(QaAuthoringForm qaAuthoringForm, HttpServletRequest request)
+    public String addSingleQuestion(@ModelAttribute("newQuestionForm") QaAuthoringForm newQuestionForm, HttpServletRequest request)
 	    throws IOException, ServletException {
 
-	String httpSessionID = qaAuthoringForm.getHttpSessionID();
+	String httpSessionID = newQuestionForm.getHttpSessionID();
 
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
 		.getAttribute(httpSessionID);
 
 	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	qaAuthoringForm.setContentFolderID(contentFolderID);
+	newQuestionForm.setContentFolderID(contentFolderID);
 
 	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
 
@@ -765,51 +769,52 @@
 	String richTextTitle = request.getParameter(QaAppConstants.TITLE);
 	String richTextInstructions = request.getParameter(QaAppConstants.INSTRUCTIONS);
 
-	qaAuthoringForm.setTitle(richTextTitle);
-	qaAuthoringForm.setInstructions(richTextInstructions);
+	newQuestionForm.setTitle(richTextTitle);
+	newQuestionForm.setInstructions(richTextInstructions);
 
 	sessionMap.put(QaAppConstants.ACTIVITY_TITLE_KEY, richTextTitle);
 	sessionMap.put(QaAppConstants.ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
 
 	request.getSession().setAttribute(httpSessionID, sessionMap);
 
-	QaUtils.setFormProperties(request, qaAuthoringForm, strToolContentID, httpSessionID);
+	QaUtils.setFormProperties(request, newQuestionForm, strToolContentID, httpSessionID);
 
-	qaAuthoringForm.setToolContentID(strToolContentID);
-	qaAuthoringForm.setHttpSessionID(httpSessionID);
-	qaAuthoringForm.setCurrentTab("1");
+	newQuestionForm.setToolContentID(strToolContentID);
+	newQuestionForm.setHttpSessionID(httpSessionID);
+	newQuestionForm.setCurrentTab("1");
 
 	request.getSession().setAttribute(httpSessionID, sessionMap);
 	request.setAttribute(QaAppConstants.TOTAL_QUESTION_COUNT, new Integer(questionDTOs.size()));
+	request.setAttribute("authoringForm", newQuestionForm);
 	return "authoring/AuthoringTabsHolder";
     }
 
     /**
      * opens up an new screen within the current page for adding a new question
      */
     @RequestMapping("/newQuestionBox")
-    public String newQuestionBox(QaAuthoringForm qaAuthoringForm, HttpServletRequest request)
+    public String newQuestionBox(@ModelAttribute QaAuthoringForm authoringForm, HttpServletRequest request)
 	    throws IOException, ServletException {
 
-	String httpSessionID = qaAuthoringForm.getHttpSessionID();
+	String httpSessionID = authoringForm.getHttpSessionID();
 
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
 		.getAttribute(httpSessionID);
 
 	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
 
-	qaAuthoringForm.setContentFolderID(contentFolderID);
+	authoringForm.setContentFolderID(contentFolderID);
 
 	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
 
 	String richTextTitle = request.getParameter(QaAppConstants.TITLE);
 
 	String richTextInstructions = request.getParameter(QaAppConstants.INSTRUCTIONS);
 
-	qaAuthoringForm.setTitle(richTextTitle);
-	qaAuthoringForm.setInstructions(richTextInstructions);
+	authoringForm.setTitle(richTextTitle);
+	authoringForm.setInstructions(richTextInstructions);
 
-	QaUtils.setFormProperties(request, qaAuthoringForm, strToolContentID, httpSessionID);
+	QaUtils.setFormProperties(request, authoringForm, strToolContentID, httpSessionID);
 
 	Collection<QaQuestionDTO> questionDTOs = (Collection<QaQuestionDTO>) sessionMap
 		.get(QaAppConstants.LIST_QUESTION_DTOS);
@@ -823,24 +828,25 @@
 	    request.setAttribute(QaAppConstants.ATTR_WIZARD_CATEGORIES, qaService.getWizardCategories());
 	}
 
+	request.setAttribute("authoringForm", authoringForm);
 	return "authoring/newQuestionBox";
     }
 
     /**
      * opens up an new screen within the current page for editing a question
      */
     @RequestMapping("/newEditableQuestionBox")
-    public String newEditableQuestionBox(QaAuthoringForm qaAuthoringForm, HttpServletRequest request)
+    public String newEditableQuestionBox(QaAuthoringForm authoringForm, HttpServletRequest request)
 	    throws IOException, ServletException {
 
-	String httpSessionID = qaAuthoringForm.getHttpSessionID();
+	String httpSessionID = authoringForm.getHttpSessionID();
 
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
 		.getAttribute(httpSessionID);
 
 	String questionIndex = request.getParameter("questionIndex");
 
-	qaAuthoringForm.setEditableQuestionIndex(questionIndex);
+	authoringForm.setEditableQuestionIndex(questionIndex);
 
 	List<QaQuestionDTO> questionDTOs = (List<QaQuestionDTO>) sessionMap.get(QaAppConstants.LIST_QUESTION_DTOS);
 
@@ -866,24 +872,25 @@
 	}
 
 	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	qaAuthoringForm.setContentFolderID(contentFolderID);
+	authoringForm.setContentFolderID(contentFolderID);
 
 	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
 
 	String richTextTitle = request.getParameter(QaAppConstants.TITLE);
 	String richTextInstructions = request.getParameter(QaAppConstants.INSTRUCTIONS);
 
-	qaAuthoringForm.setTitle(richTextTitle);
-	qaAuthoringForm.setInstructions(richTextInstructions);
+	authoringForm.setTitle(richTextTitle);
+	authoringForm.setInstructions(richTextInstructions);
 
-	QaUtils.setFormProperties(request, qaAuthoringForm, strToolContentID, httpSessionID);
+	QaUtils.setFormProperties(request, authoringForm, strToolContentID, httpSessionID);
 
-	qaAuthoringForm.setRequired(requiredBoolean);
-	qaAuthoringForm.setMinWordsLimit(minWordsLimit);
-	qaAuthoringForm.setEditableQuestionText(editableQuestion);
-	qaAuthoringForm.setFeedback(editableFeedback);
+	authoringForm.setRequired(requiredBoolean);
+	authoringForm.setMinWordsLimit(minWordsLimit);
+	authoringForm.setEditableQuestionText(editableQuestion);
+	authoringForm.setFeedback(editableFeedback);
 
 	request.setAttribute(QaAppConstants.TOTAL_QUESTION_COUNT, new Integer(questionDTOs.size()));
+	request.setAttribute("authoringForm", authoringForm);
 
 	return "authoring/newQuestionBox";
     }
@@ -892,10 +899,10 @@
      * removes a question from the questions map
      */
     @RequestMapping("/removeQuestion")
-    public String removeQuestion(QaAuthoringForm qaAuthoringForm, HttpServletRequest request)
+    public String removeQuestion(QaAuthoringForm authoringForm, HttpServletRequest request)
 	    throws IOException, ServletException {
 
-	String httpSessionID = qaAuthoringForm.getHttpSessionID();
+	String httpSessionID = authoringForm.getHttpSessionID();
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
 		.getAttribute(httpSessionID);
 
@@ -945,19 +952,20 @@
 	}
 
 	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	qaAuthoringForm.setContentFolderID(contentFolderID);
+	authoringForm.setContentFolderID(contentFolderID);
 	String richTextTitle = request.getParameter(QaAppConstants.TITLE);
 	String richTextInstructions = request.getParameter(QaAppConstants.INSTRUCTIONS);
 	sessionMap.put(QaAppConstants.ACTIVITY_TITLE_KEY, richTextTitle);
 	sessionMap.put(QaAppConstants.ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
 	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
-	qaAuthoringForm.setTitle(richTextTitle);
-	qaAuthoringForm.setInstructions(richTextInstructions);
+	authoringForm.setTitle(richTextTitle);
+	authoringForm.setInstructions(richTextInstructions);
 	request.getSession().setAttribute(httpSessionID, sessionMap);
-	QaUtils.setFormProperties(request, qaAuthoringForm, strToolContentID, httpSessionID);
-	qaAuthoringForm.setToolContentID(strToolContentID);
-	qaAuthoringForm.setHttpSessionID(httpSessionID);
-	qaAuthoringForm.setCurrentTab("1");
+	QaUtils.setFormProperties(request, authoringForm, strToolContentID, httpSessionID);
+	authoringForm.setToolContentID(strToolContentID);
+	authoringForm.setHttpSessionID(httpSessionID);
+	authoringForm.setCurrentTab("1");
+	request.setAttribute("authoringForm", authoringForm);
 
 	return "authoring/AuthoringTabsHolder";
     }
@@ -966,10 +974,10 @@
      * moves a question down in the list
      */
     @RequestMapping("/moveQuestionDown")
-    public String moveQuestionDown(QaAuthoringForm qaAuthoringForm, HttpServletRequest request)
+    public String moveQuestionDown(QaAuthoringForm authoringForm, HttpServletRequest request)
 	    throws IOException, ServletException {
 
-	String httpSessionID = qaAuthoringForm.getHttpSessionID();
+	String httpSessionID = authoringForm.getHttpSessionID();
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
 		.getAttribute(httpSessionID);
 
@@ -987,7 +995,7 @@
 	sessionMap.put(QaAppConstants.LIST_QUESTION_DTOS, questionDTOs);
 
 	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	qaAuthoringForm.setContentFolderID(contentFolderID);
+	authoringForm.setContentFolderID(contentFolderID);
 
 	String richTextTitle = request.getParameter(QaAppConstants.TITLE);
 
@@ -998,30 +1006,31 @@
 
 	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
 
-	qaAuthoringForm.setTitle(richTextTitle);
-	qaAuthoringForm.setInstructions(richTextInstructions);
+	authoringForm.setTitle(richTextTitle);
+	authoringForm.setInstructions(richTextInstructions);
 	request.getSession().setAttribute(httpSessionID, sessionMap);
 
-	QaUtils.setFormProperties(request, qaAuthoringForm, strToolContentID, httpSessionID);
+	QaUtils.setFormProperties(request, authoringForm, strToolContentID, httpSessionID);
 
-	qaAuthoringForm.setToolContentID(strToolContentID);
-	qaAuthoringForm.setHttpSessionID(httpSessionID);
-	qaAuthoringForm.setCurrentTab("1");
+	authoringForm.setToolContentID(strToolContentID);
+	authoringForm.setHttpSessionID(httpSessionID);
+	authoringForm.setCurrentTab("1");
 
 	request.setAttribute(QaAppConstants.LIST_QUESTION_DTOS, questionDTOs);
 
 	request.setAttribute(QaAppConstants.TOTAL_QUESTION_COUNT, new Integer(questionDTOs.size()));
+	request.setAttribute("authoringForm", authoringForm);
 	return "authoring/AuthoringTabsHolder";
     }
 
     /**
      * moves a question up in the list
      */
     @RequestMapping("/moveQuestionUp")
-    public String moveQuestionUp(QaAuthoringForm qaAuthoringForm, HttpServletRequest request)
+    public String moveQuestionUp(QaAuthoringForm authoringForm, HttpServletRequest request)
 	    throws IOException, ServletException {
 
-	String httpSessionID = qaAuthoringForm.getHttpSessionID();
+	String httpSessionID = authoringForm.getHttpSessionID();
 
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
 		.getAttribute(httpSessionID);
@@ -1040,7 +1049,7 @@
 
 	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
 
-	qaAuthoringForm.setContentFolderID(contentFolderID);
+	authoringForm.setContentFolderID(contentFolderID);
 
 	String richTextTitle = request.getParameter(QaAppConstants.TITLE);
 
@@ -1051,20 +1060,21 @@
 
 	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
 
-	qaAuthoringForm.setTitle(richTextTitle);
-	qaAuthoringForm.setInstructions(richTextInstructions);
+	authoringForm.setTitle(richTextTitle);
+	authoringForm.setInstructions(richTextInstructions);
 
 	request.getSession().setAttribute(httpSessionID, sessionMap);
 
-	QaUtils.setFormProperties(request, qaAuthoringForm, strToolContentID, httpSessionID);
+	QaUtils.setFormProperties(request, authoringForm, strToolContentID, httpSessionID);
 
-	qaAuthoringForm.setToolContentID(strToolContentID);
-	qaAuthoringForm.setHttpSessionID(httpSessionID);
-	qaAuthoringForm.setCurrentTab("1");
+	authoringForm.setToolContentID(strToolContentID);
+	authoringForm.setHttpSessionID(httpSessionID);
+	authoringForm.setCurrentTab("1");
 
 	request.setAttribute(QaAppConstants.LIST_QUESTION_DTOS, questionDTOs);
 
 	request.setAttribute(QaAppConstants.TOTAL_QUESTION_COUNT, new Integer(questionDTOs.size()));
+	request.setAttribute("authoringForm", authoringForm);
 	return "authoring/AuthoringTabsHolder";
     }
 
Index: lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5f5d164117e56516c294f276bbaa4a33e2108372
--- lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision 5f5d164117e56516c294f276bbaa4a33e2108372)
@@ -46,12 +46,11 @@
 </lams:head>
 
 <body class="stripes">
-<form:form action="authoring.do" modelAttribute="authoringForm" method="POST" id="authoringForm">
+<form:form action="submitAllContent.do" modelAttribute="authoringForm" method="POST" id="authoringForm">
 	<c:set var="sessionMap" value="${sessionScope[authoringForm.httpSessionID]}" />
 	<c:set var="title"><fmt:message key="activity.title" /></c:set>
 	
 	<form:hidden path="mode" value="${mode}" />
-	<form:hidden path="dispatch" value="submitAllContent" />
 	<form:hidden path="toolContentID" />
 	<form:hidden path="contentFolderID" />
 	<form:hidden path="httpSessionID"/>		
Index: lams_tool_laqa/web/authoring/addCondition.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5f5d164117e56516c294f276bbaa4a33e2108372
--- lams_tool_laqa/web/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision 5f5d164117e56516c294f276bbaa4a33e2108372)
@@ -9,7 +9,7 @@
 	<div class="panel-body">	
 	
 		<!-- Basic Info Form-->
-		<form:form action="saveOrUpdateCondition.do" method="post" modelAttribute="QaConditionForm" id="QaConditionForm" >
+		<form:form action="../authoringConditions/saveOrUpdateCondition.do" method="post" modelAttribute="QaConditionForm" id="QaConditionForm" >
 			<%@ include file="/common/messages.jsp"%>
 			<form:hidden path="orderId" />
 			
Index: lams_tool_laqa/web/authoring/conditions.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5f5d164117e56516c294f276bbaa4a33e2108372
--- lams_tool_laqa/web/authoring/conditions.jsp	(.../conditions.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/authoring/conditions.jsp	(.../conditions.jsp)	(revision 5f5d164117e56516c294f276bbaa4a33e2108372)
@@ -13,26 +13,26 @@
 	}
 	
 	function editCondition(orderId,sessionMapID){
-		var url = "<c:url value='/authoring/editCondition.do?orderId='/>"
+		var url = "<c:url value='/authoringConditions/editCondition.do?orderId='/>"
 			  + orderId + "&sessionMapID=" + sessionMapID;
 		showConditionMessage(url);
 	}
 	
 	function deleteCondition(orderId, sessionMapID){
-		$("#conditionsArea").load("<c:url value='/authoring/removeCondition.do'/>",{
+		$("#conditionsArea").load("<c:url value='/authoringConditions/removeCondition.do'/>",{
 			'orderId' : orderId,
 			'sessionMapID' : sessionMapID
 		});
 	}
 	
 	function upCondition(orderId,sessionMapID){
-		$("#conditionsArea").load("<c:url value='/authoring/upCondition.do'/>",{
+		$("#conditionsArea").load("<c:url value='/authoringConditions/upCondition.do'/>",{
 			'orderId' : orderId,
 			'sessionMapID' : sessionMapID
 		});
 	}
 	function downCondition(orderId,sessionMapID){
-		$("#conditionsArea").load("<c:url value='/authoring/downCondition.do'/>",{
+		$("#conditionsArea").load("<c:url value='/authoringConditions/downCondition.do'/>",{
 			'orderId' : orderId,
 			'sessionMapID' : sessionMapID
 		});
@@ -53,7 +53,7 @@
 </div>
  
  <div class="form-inline">
-	<a href="javascript:showConditionMessage('<lams:WebAppURL/> authoring/newConditionInit.do?sessionMapID=${QaConditionForm.httpSessionID}');" 
+	<a href="javascript:showConditionMessage('<lams:WebAppURL/>authoringConditions/newConditionInit.do?sessionMapID=${QaConditionForm.httpSessionID}');" 
 		class="btn btn-default btn-sm"><i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.authoring.conditions.add.condition" /></a> 
 </div>
 
Index: lams_tool_laqa/web/authoring/newQuestionBox.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5f5d164117e56516c294f276bbaa4a33e2108372
--- lams_tool_laqa/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision 5f5d164117e56516c294f276bbaa4a33e2108372)
@@ -5,8 +5,7 @@
 </div>
 
 <div class="panel-body">
-<form:form action="authoring.do?validate=false" modelAttribute="newQuestionForm" id="newQuestionForm" method="POST">
-	<form:hidden path="dispatch" value="${empty newQuestionForm.editableQuestionIndex ? 'addSingleQuestion' : 'saveSingleQuestion'}" />
+<form:form action="${empty newQuestionForm.editableQuestionIndex ? 'addSingleQuestion' : 'saveSingleQuestion'}.do" modelAttribute="newQuestionForm" id="newQuestionForm" method="POST">
 	<form:hidden path="toolContentID" />
 	<form:hidden path="httpSessionID" />
 	<form:hidden path="contentFolderID" />