Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r14949f3bb9736ad6386b56eca018dc1257cb36a1
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	(.../QaAppConstants.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	(.../QaAppConstants.java)	(revision 14949f3bb9736ad6386b56eca018dc1257cb36a1)
@@ -51,11 +51,11 @@
     public static final String AUTHORING_STARTER = "starter";
     public static final String TITLE = "title";
     public static final String INSTRUCTIONS = "instructions";
-    public static final String LOAD_LEARNER = "loadLearner";
+    public static final String LOAD_LEARNER = "learning/AnswersContent";
     public static final String LEARNING_STARTER = "learningStarter";
     public static final String MONITORING_STARTER = "monitoringStarter";
     public static final String VIEW_ALL_RESULTS = "viewAllResults";
-    public static final String INDIVIDUAL_LEARNER_RESULTS = "individualLearnerResults";
+    public static final String INDIVIDUAL_LEARNER_RESULTS = "learning/IndividualLearnerResults";
     public static final String MAP_ALL_RESULTS_KEY = "mapAllResultsKey";
     public static final String SOURCE_QA_STARTER = "sourceQaStarter";
     public static final String EDITABLE_RESPONSE_ID = "editableResponseId";
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java
===================================================================
diff -u -r46e01bf046d755f571ba59957ac869c086bad58c -r14949f3bb9736ad6386b56eca018dc1257cb36a1
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java	(.../QaLearningController.java)	(revision 46e01bf046d755f571ba59957ac869c086bad58c)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java	(.../QaLearningController.java)	(revision 14949f3bb9736ad6386b56eca018dc1257cb36a1)
@@ -112,15 +112,15 @@
     }
 
     @RequestMapping("/learning")
-    public String execute(@ModelAttribute("learningForm") QaLearningForm learningForm, HttpServletRequest request)
+    public String execute(@ModelAttribute("qaLearningForm") QaLearningForm qaLearningForm, HttpServletRequest request)
 	    throws IOException, ServletException, QaApplicationException {
 
 	QaUtils.cleanUpSessionAbsolute(request);
 
 	/* validate learning mode parameters */
-	validateParameters(request, learningForm);
-	String mode = learningForm.getMode();
-	String toolSessionID = learningForm.getToolSessionID();
+	validateParameters(request, qaLearningForm);
+	String mode = qaLearningForm.getMode();
+	String toolSessionID = qaLearningForm.getToolSessionID();
 
 	/*
 	 * By now, the passed tool session id MUST exist in the db by calling:
@@ -149,8 +149,8 @@
 	    user = getCurrentUser(toolSessionID);
 	}
 	Long userId = user.getQueUsrId();
-	learningForm.setUserID(user.getQueUsrId().toString());
-	request.setAttribute("qaLearningForm", learningForm);
+	qaLearningForm.setUserID(user.getQueUsrId().toString());
+	request.setAttribute("qaLearningForm", qaLearningForm);
 	QaQueUsr groupLeader = null;
 	if (qaContent.isUseSelectLeaderToolOuput()) {
 	    groupLeader = qaService.checkLeaderSelectToolForSessionLeader(user, new Long(toolSessionID).longValue());
@@ -182,15 +182,15 @@
 	Map mapQuestionStrings = new TreeMap(new QaComparator());
 	Map<Integer, QaQuestionDTO> mapQuestions = new TreeMap<>();
 
-	String httpSessionID = learningForm.getHttpSessionID();
+	String httpSessionID = qaLearningForm.getHttpSessionID();
 	SessionMap<String, Object> sessionMap = httpSessionID == null ? null
 		: (SessionMap<String, Object>) request.getSession().getAttribute(httpSessionID);
 	if (sessionMap == null) {
 	    sessionMap = new SessionMap<>();
 	    Map mapSequentialAnswers = new HashMap();
 	    sessionMap.put(MAP_SEQUENTIAL_ANSWERS_KEY, mapSequentialAnswers);
 	    request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
-	    learningForm.setHttpSessionID(sessionMap.getSessionID());
+	    qaLearningForm.setHttpSessionID(sessionMap.getSessionID());
 
 	    sessionMap.put(AttributeNames.ATTR_LEARNER_CONTENT_FOLDER,
 		    qaService.getLearnerContentFolder(new Long(toolSessionID), user.getQueUsrId()));
@@ -223,7 +223,7 @@
 		MY_SIGNATURE, userId.intValue());
 	if (notebookEntry != null) {
 	    //String notebookEntryPresentable = QaUtils.replaceNewLines(notebookEntry.getEntry());
-	    learningForm.setEntryText(notebookEntry.getEntry());
+	    qaLearningForm.setEntryText(notebookEntry.getEntry());
 	    generalLearnerFlowDTO.setNotebookEntry(notebookEntry.getEntry());
 	}
 
@@ -263,7 +263,7 @@
 	generalLearnerFlowDTO.setMapQuestions(mapQuestionStrings);
 	generalLearnerFlowDTO.setMapQuestionContentLearner(mapQuestions);
 	generalLearnerFlowDTO.setTotalQuestionCount(new Integer(mapQuestions.size()));
-	learningForm.setTotalQuestionCount(new Integer(mapQuestions.size()).toString());
+	qaLearningForm.setTotalQuestionCount(new Integer(mapQuestions.size()).toString());
 
 	String feedBackType = "";
 	if (qaContent.isQuestionsSequenced()) {
@@ -359,7 +359,7 @@
 	 * if the 'All Responses' has been clicked no more user entry is accepted, and isResponseFinalized() returns
 	 * true
 	 */
-	Long currentToolSessionID = new Long(learningForm.getToolSessionID());
+	Long currentToolSessionID = new Long(qaLearningForm.getToolSessionID());
 
 	//if Response is Finalized
 	if (user.isResponseFinalized()) {
@@ -567,8 +567,7 @@
 	if (errorMap.isEmpty() && qaContent.isNotifyTeachersOnResponseSubmit()) {
 	    qaService.notifyTeachersOnResponseSubmit(new Long(toolSessionID));
 	}
-	request.setAttribute("learningForm", qaLearningForm);
-	return "learning/AnswersContent";
+	return forwardName;
     }
 
     @RequestMapping("/checkLeaderProgress")
@@ -688,6 +687,7 @@
 
 	request.setAttribute(QaAppConstants.GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
 	qaLearningForm.resetAll();
+	request.setAttribute("learningForm", qaLearningForm);
 	return "learning/AnswersContent";
     }
 
@@ -1100,7 +1100,7 @@
 
     /**
      *
-     * @param reflectionForm
+     * @param qaLearningForm
      * @param request
      * @param response
      * @return
@@ -1109,21 +1109,21 @@
      * @throws ToolException
      */
     @RequestMapping("/submitReflection")
-    public String submitReflection(QaLearningForm reflectionForm, HttpServletRequest request,
+    public String submitReflection(@ModelAttribute("qaLearningForm")QaLearningForm qaLearningForm, HttpServletRequest request,
 	    HttpServletResponse response) throws IOException, ServletException, ToolException {
 
-	LearningUtil.saveFormRequestData(request, reflectionForm);
+	LearningUtil.saveFormRequestData(request, qaLearningForm);
 
-	String httpSessionID = reflectionForm.getHttpSessionID();
+	String httpSessionID = qaLearningForm.getHttpSessionID();
 
-	reflectionForm.setHttpSessionID(httpSessionID);
+	qaLearningForm.setHttpSessionID(httpSessionID);
 
 	String toolSessionIDString = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
-	reflectionForm.setToolSessionID(toolSessionIDString);
+	qaLearningForm.setToolSessionID(toolSessionIDString);
 	Long toolSessionID = new Long(toolSessionIDString);
 
 	String userIDString = request.getParameter("userID");
-	reflectionForm.setUserID(userIDString);
+	qaLearningForm.setUserID(userIDString);
 	Integer userID = new Integer(userIDString);
 
 	String reflectionEntry = request.getParameter(QaAppConstants.ENTRY_TEXT);
@@ -1144,26 +1144,26 @@
 	    qaService.updateEntry(entry);
 	}
 
-	reflectionForm.resetUserActions(); /* resets all except submitAnswersContent */
-	return endLearning(reflectionForm, request, response);
+	qaLearningForm.resetUserActions(); /* resets all except submitAnswersContent */
+	return endLearning(qaLearningForm, request, response);
     }
 
     /**
      *
-     * @param reflectionForm
+     * @param qaLearningForm
      * @param request
      * @return
      * @throws IOException
      * @throws ServletException
      * @throws ToolException
      */
     @RequestMapping("/forwardtoReflection")
-    public String forwardtoReflection(QaLearningForm reflectionForm, HttpServletRequest request)
+    public String forwardtoReflection(@ModelAttribute("qaLearningForm")QaLearningForm qaLearningForm, HttpServletRequest request)
 	    throws IOException, ServletException, ToolException {
 
-	String httpSessionID = reflectionForm.getHttpSessionID();
+	String httpSessionID = qaLearningForm.getHttpSessionID();
 
-	reflectionForm.setHttpSessionID(httpSessionID);
+	qaLearningForm.setHttpSessionID(httpSessionID);
 
 	String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
 
@@ -1172,9 +1172,9 @@
 	QaContent qaContent = qaSession.getQaContent();
 
 	String userID = request.getParameter("userID");
-	reflectionForm.setUserID(userID);
+	qaLearningForm.setUserID(userID);
 
-	return forwardtoReflection(request, qaContent, toolSessionID, userID, reflectionForm);
+	return forwardtoReflection(request, qaContent, toolSessionID, userID, qaLearningForm);
     }
 
     @RequestMapping("/forwardtoReflection")
Index: lams_tool_laqa/web/learning/AnswersContent.jsp
===================================================================
diff -u -r7ea9b852e5fe8dc5688f983f162064d862f147de -r14949f3bb9736ad6386b56eca018dc1257cb36a1
--- lams_tool_laqa/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 7ea9b852e5fe8dc5688f983f162064d862f147de)
+++ lams_tool_laqa/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 14949f3bb9736ad6386b56eca018dc1257cb36a1)
@@ -93,8 +93,8 @@
 		
 		function doSubmit(actionMethod) {
 			$('.btn').prop('disabled', true);
-			document.forms.learningForm.action=actionMethod+".do"; 
-			document.forms.learningForm.submit();
+			document.forms.qaLearningForm.action=actionMethod+".do"; 
+			document.forms.qaLearningForm.submit();
 		}
 		
 		if (${!hasEditRight && mode != "teacher"}) {
@@ -133,7 +133,7 @@
 					}
 					
 					//ajax form submit
-					$('#learningForm').ajaxSubmit({
+					$('#qaLearningForm').ajaxSubmit({
 						url: "<c:url value='autoSaveAnswers.do?date='/>" + new Date().getTime(),
 			               success: function() {
 			               	$.growlUI('<i class="fa fa-lg fa-floppy-o"></i> <fmt:message key="label.learning.draft.autosaved" />');
@@ -200,7 +200,7 @@
 
 	<!-- form needs to be outside page so that the form bean can be picked up by Page tag. -->
 	<form:form action="${generalLearnerFlowDTO.questionListingMode == 'questionListingModeSequential' ? 'getNextQuestion.do' : 'submitAnswersContent.do'}"
-	 method="POST" target="_self" id="learningForm" modelAttribute="learningForm">
+	 method="POST" target="_self" id="qaLearningForm" modelAttribute="qaLearningForm">
 
 	<lams:Page type="learner" title="${generalLearnerFlowDTO.activityTitle}">
 
Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -r7ea9b852e5fe8dc5688f983f162064d862f147de -r14949f3bb9736ad6386b56eca018dc1257cb36a1
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 7ea9b852e5fe8dc5688f983f162064d862f147de)
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 14949f3bb9736ad6386b56eca018dc1257cb36a1)
@@ -13,7 +13,7 @@
 	<script language="JavaScript" type="text/JavaScript">
 		function submitMethod(actionMethod) {
 			$('.btn').prop('disabled', true);
-			document.forms.qaLearningForm.action = actionMethod=".do";
+			document.forms.qaLearningForm.action = actionMethod+".do";
 			document.forms.qaLearningForm.submit();
 		}
 	</script>
@@ -22,7 +22,7 @@
 <body class="stripes">
 
 	<!-- form needs to be outside page so that the form bean can be picked up by Page tag. -->
-	<form:form action="learning.do" method="POST" target="_self">
+	<form:form action="learning.do" method="POST" modelAttribute="qaLearningForm" target="_self">
 
 		<lams:Page type="learner" title="${generalLearnerFlowDTO.activityTitle}">
 
Index: lams_tool_laqa/web/learning/Notebook.jsp
===================================================================
diff -u -r7ea9b852e5fe8dc5688f983f162064d862f147de -r14949f3bb9736ad6386b56eca018dc1257cb36a1
--- lams_tool_laqa/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 7ea9b852e5fe8dc5688f983f162064d862f147de)
+++ lams_tool_laqa/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 14949f3bb9736ad6386b56eca018dc1257cb36a1)
@@ -17,7 +17,7 @@
 <body class="stripes">
 
 <!-- form needs to be outside page so that the form bean can be picked up by Page tag. -->
-<form:form action="learning/submitReflection.do" modelAttribute="reflectionForm" id="dreflectionForm" onsubmit="disableFinishButton()">
+<form:form action="learning/submitReflection.do" modelAttribute="qaLearningForm" id="qaLearningForm" onsubmit="disableFinishButton()">
 
 <lams:Page type="learner" title="${generalLearnerFlowDTO.activityTitle}">
 
Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
===================================================================
diff -u -re378511908674f648eab0056e28caf45bd7d8451 -r14949f3bb9736ad6386b56eca018dc1257cb36a1
--- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision e378511908674f648eab0056e28caf45bd7d8451)
+++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 14949f3bb9736ad6386b56eca018dc1257cb36a1)
@@ -427,10 +427,10 @@
 						</div>
 						<div class="panel-body">
 							<div class="reflectionInstructions">
-								<lams:out value="${learningForm.reflectionSubject}" escapeHtml="true" />
+								<lams:out value="${qaLearningForm.reflectionSubject}" escapeHtml="true" />
 							</div>
 							<div class="panel">
-								<lams:out value="${learningForm.entryText}" escapeHtml="true" />
+								<lams:out value="${qaLearningForm.entryText}" escapeHtml="true" />
 							</div>
 
 							<c:if test="${hasEditRight}">
Index: lams_tool_pixlr/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r46e01bf046d755f571ba59957ac869c086bad58c -r14949f3bb9736ad6386b56eca018dc1257cb36a1
--- lams_tool_pixlr/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 46e01bf046d755f571ba59957ac869c086bad58c)
+++ lams_tool_pixlr/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 14949f3bb9736ad6386b56eca018dc1257cb36a1)
@@ -3,9 +3,9 @@
 <%@ page import="org.lamsfoundation.lams.tool.pixlr.util.PixlrConstants"%>
 <%@ page import="org.lamsfoundation.lams.util.Configuration" %>
 <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
-<%@ page import="org.lamsfoundation.lams.util.FileValidatorUtil" %>
+<%@ page import="org.lamsfoundation.lams.util.FileValidatorSpringUtil" %>
 <c:set var="UPLOAD_FILE_LARGE_MAX_SIZE" scope="request"><%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%></c:set>
-<c:set var="UPLOAD_FILE_MAX_SIZE_AS_USER_STRING" scope="request"><%=FileValidatorUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%></c:set>
+<c:set var="UPLOAD_FILE_MAX_SIZE_AS_USER_STRING" scope="request"><%=FileValidatorSpringUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%></c:set>
 
 <lams:html>
 	<c:set var="lams">
@@ -33,11 +33,8 @@
 
 	<body class="stripes" onload="init();">
 	
-		<tiles:useAttribute name="pageTitleKey" />
-		<bean:define name="pageTitleKey" id="pTitleKey" type="String" />
-		<c:set var="title"><fmt:message key="${pTitleKey}" /></c:set>
 		
-		<lams:Page title="${title}" type="navbar">
+		<lams:Page title='<fmt:message key="pageTitle.authoring"/>' type="navbar">
 				
 			<script type="text/javascript">
 				function validate() {
@@ -64,7 +61,7 @@
 				}
 			</script>	
 		
-			<form:form action="authoring/updateContent.do" modelAttribute="authoringForm" id="authoringForm" method="post" onsubmit="return validate();">
+			<form:form action="updateContent.do" modelAttribute="authoringForm" id="authoringForm" method="post" onsubmit="return validate();">
 				<c:set var="sessionMap" value="${sessionScope[authoringForm.sessionMapID]}" />
 				
 				<form:hidden path="currentTab" id="currentTab" />
Index: lams_tool_pixlr/web/pages/authoring/basic.jsp
===================================================================
diff -u -re378511908674f648eab0056e28caf45bd7d8451 -r14949f3bb9736ad6386b56eca018dc1257cb36a1
--- lams_tool_pixlr/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision e378511908674f648eab0056e28caf45bd7d8451)
+++ lams_tool_pixlr/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 14949f3bb9736ad6386b56eca018dc1257cb36a1)
@@ -24,7 +24,7 @@
     <label for="title">
     	<fmt:message key="label.authoring.basic.title"/>
     </label>
-    <form:input path="title" class="form-control"/>
+    <form:input path="title" cssClass="form-control"/>
 </div>
 
 <div class="form-group">
Index: lams_tool_pixlr/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r46e01bf046d755f571ba59957ac869c086bad58c -r14949f3bb9736ad6386b56eca018dc1257cb36a1
--- lams_tool_pixlr/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 46e01bf046d755f571ba59957ac869c086bad58c)
+++ lams_tool_pixlr/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 14949f3bb9736ad6386b56eca018dc1257cb36a1)
@@ -23,11 +23,7 @@
 
 	<body class="stripes" onload="init();">
 	
-		<tiles:useAttribute name="pageTitleKey" />
-		<bean:define name="pageTitleKey" id="pTitleKey" type="String" />
-		<c:set var="title"><fmt:message key="${pTitleKey}" /></c:set>
-		
-		<lams:Page title="${title}" type="navbar">
+		<lams:Page title="<fmt:message key="pageTitle.monitoring" />" type="navbar">
 			<script type="text/javascript">
 				var initialTabId = "${pixlrDTO.currentTab}";
 			</script>
Index: lams_tool_pixlr/web/pages/monitoring/pixlrDisplay.jsp
===================================================================
diff -u -r46e01bf046d755f571ba59957ac869c086bad58c -r14949f3bb9736ad6386b56eca018dc1257cb36a1
--- lams_tool_pixlr/web/pages/monitoring/pixlrDisplay.jsp	(.../pixlrDisplay.jsp)	(revision 46e01bf046d755f571ba59957ac869c086bad58c)
+++ lams_tool_pixlr/web/pages/monitoring/pixlrDisplay.jsp	(.../pixlrDisplay.jsp)	(revision 14949f3bb9736ad6386b56eca018dc1257cb36a1)
@@ -22,12 +22,8 @@
 		<script type="text/javascript" src="${tool}includes/javascript/common.js"></script>
 	</lams:head>
 	<body class="stripes">
-	
-		<tiles:useAttribute name="pageTitleKey" ignore="true"/>
-		<bean:define name="pageTitleKey" id="pTitleKey" type="String" />
-		<c:set var="title"><fmt:message key="${pTitleKey}" /></c:set>
 		
-		<lams:Page title="${title}" type="learner">
+		<lams:Page title="<fmt:message key="pageTitle.monitoring" />" type="learner">
 			<div id="content">
 				<table class="table">
 				<tr>