Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/TblMonitoringController.java
===================================================================
diff -u -ra5ee55c529ff5dbfb9e102604f7f253c141861ba -rd5ad23d54e43221d9682c715519004cf8bbbfc2f
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/TblMonitoringController.java	(.../TblMonitoringController.java)	(revision a5ee55c529ff5dbfb9e102604f7f253c141861ba)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/TblMonitoringController.java	(.../TblMonitoringController.java)	(revision d5ad23d54e43221d9682c715519004cf8bbbfc2f)
@@ -28,7 +28,7 @@
     private static Logger log = Logger.getLogger(TblMonitoringController.class);
 
     @Autowired
-    @Qualifier("leaderselectionService")
+    @Qualifier(value = "leaderselectionService")
     private ILeaderselectionService leaderselectionService;
 
     /**
Index: lams_tool_leader/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r6dfff2871fa49eb6d8dcc49ede08552a8d73e8b3 -rd5ad23d54e43221d9682c715519004cf8bbbfc2f
--- lams_tool_leader/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 6dfff2871fa49eb6d8dcc49ede08552a8d73e8b3)
+++ lams_tool_leader/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision d5ad23d54e43221d9682c715519004cf8bbbfc2f)
@@ -123,11 +123,11 @@
     }  				
 </script>	
 <div id="saveCancelButtons" >
-		<html:link href="javascript:doSubmit_Form_Only();" styleId="saveButton" property="submit" styleClass="btn btn-primary pull-right">
+		<a href="javascript:doSubmit_Form_Only();" id="saveButton" property="submit" class="btn btn-primary pull-right">
 			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
-		</html:link>
-		<html:link href="javascript:;" property="cancel" styleId="cancelButton" onclick="javascript:doCancel()" styleClass="btn btn-default roffset5 pull-right">
+		</a>
+		<a href="javascript:;" name="cancel" id="cancelButton" onclick="javascript:doCancel()" class="btn btn-default roffset5 pull-right">
 			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
-		</html:link>
+		</a>
 </div>
 <!-- end tab content -->
\ No newline at end of file
Index: lams_tool_leader/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r36e474218e1201198ba926e57e56c7a885db1a9f -rd5ad23d54e43221d9682c715519004cf8bbbfc2f
--- lams_tool_leader/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 36e474218e1201198ba926e57e56c7a885db1a9f)
+++ lams_tool_leader/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision d5ad23d54e43221d9682c715519004cf8bbbfc2f)
@@ -34,7 +34,6 @@
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
 
 <c:set var="class" value=""/>
 <c:if test="${id == 1}">
Index: lams_tool_leader/web/pages/authoring/authoring.jsp
===================================================================
diff -u -rcec2df99f0434302608306f07fe5f48c09546ff9 -rd5ad23d54e43221d9682c715519004cf8bbbfc2f
--- lams_tool_leader/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision cec2df99f0434302608306f07fe5f48c09546ff9)
+++ lams_tool_leader/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision d5ad23d54e43221d9682c715519004cf8bbbfc2f)
@@ -42,7 +42,7 @@
 						 <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}" /> 
+						             <c:out value="${error}" /><br /> 
 						         </c:forEach> 
 						     </lams:Alert> 
 						</c:if>		
Index: lams_tool_leader/web/pages/monitoring/editActivity.jsp
===================================================================
diff -u -r58448aa728e808e025d15546ea5375e6db321ff3 -rd5ad23d54e43221d9682c715519004cf8bbbfc2f
--- lams_tool_leader/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision 58448aa728e808e025d15546ea5375e6db321ff3)
+++ lams_tool_leader/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision d5ad23d54e43221d9682c715519004cf8bbbfc2f)
@@ -35,9 +35,9 @@
 		<c:param name="mode" value="teacher" />
 		<c:param name="contentFolderID" value="${contentFolderID}" />
 	</c:url>
-	<html:link href="#nogo" onclick="javascript:launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default pull-right">
+	<a href="#nogo" onclick="javascript:launchPopup('${authoringUrl}','definelater')" class="btn btn-default pull-right">
 		<fmt:message key="button.editActivity" />
-	</html:link>
+	</a>
 </p>
 
 
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/AuthoringController.java
===================================================================
diff -u -r51891afa31c2dcc90ef04fe7976d3fd1fea509f8 -rd5ad23d54e43221d9682c715519004cf8bbbfc2f
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 51891afa31c2dcc90ef04fe7976d3fd1fea509f8)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision d5ad23d54e43221d9682c715519004cf8bbbfc2f)
@@ -51,7 +51,6 @@
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.context.WebApplicationContext;
 
 /**
  * @author
@@ -71,8 +70,6 @@
     @Qualifier("notebookService")
     private INotebookService notebookService;
 
-    @Autowired
-    private WebApplicationContext applicationContext;
 
     // Authoring SessionMap key names
     private static final String KEY_TOOL_CONTENT_ID = "toolContentID";
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/AuthoringNotebookConditionController.java
===================================================================
diff -u -r51891afa31c2dcc90ef04fe7976d3fd1fea509f8 -rd5ad23d54e43221d9682c715519004cf8bbbfc2f
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/AuthoringNotebookConditionController.java	(.../AuthoringNotebookConditionController.java)	(revision 51891afa31c2dcc90ef04fe7976d3fd1fea509f8)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/AuthoringNotebookConditionController.java	(.../AuthoringNotebookConditionController.java)	(revision d5ad23d54e43221d9682c715519004cf8bbbfc2f)
@@ -94,7 +94,7 @@
      * @param response
      * @return
      */
-    @RequestMapping(value = "/editCondition")
+    @RequestMapping("/editCondition")
     private String editCondition(NotebookConditionForm notebookConditionForm, HttpServletRequest request) {
 
 	String sessionMapID = notebookConditionForm.getSessionMapID();
@@ -126,7 +126,7 @@
      * @return
      * @throws ServletException
      */
-    @RequestMapping(value = "/saveOrUpdateCondition", method = RequestMethod.POST)
+    @RequestMapping("/saveOrUpdateCondition")
     private String saveOrUpdateCondition(
 	    @ModelAttribute("notebookConditionForm") NotebookConditionForm notebookConditionForm,
 	    HttpServletRequest request) {
@@ -143,7 +143,7 @@
 	    extractFormToNotebookCondition(request, notebookConditionForm);
 	} catch (Exception e) {
 	    // any upload exception will display as normal error message rather then throw exception directly
-	    errorMap.add("GLOBAL", messageService.getMessage(NotebookConstants.ERROR_MSG_CONDITION, e.getMessage()));
+	    errorMap.add("GLOBAL", messageService.getMessage(NotebookConstants.ERROR_MSG_CONDITION, new Object[] { e.getMessage() }));
 	    if (!errorMap.isEmpty()) {
 		request.setAttribute("errorMap", errorMap);
 		return "pages/authoring/addCondition";
@@ -222,7 +222,6 @@
 	return switchItem(request, false);
     }
 
-    @RequestMapping(value = "/switchItem")
     private String switchItem(HttpServletRequest request, boolean up) {
 	// get back sessionMAP
 	String sessionMapID = WebUtil.readStrParam(request, NotebookConstants.ATTR_SESSION_MAP_ID);
Index: lams_tool_notebook/web/pages/learning/notebook.jsp
===================================================================
diff -u -r51891afa31c2dcc90ef04fe7976d3fd1fea509f8 -rd5ad23d54e43221d9682c715519004cf8bbbfc2f
--- lams_tool_notebook/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 51891afa31c2dcc90ef04fe7976d3fd1fea509f8)
+++ lams_tool_notebook/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision d5ad23d54e43221d9682c715519004cf8bbbfc2f)
@@ -15,14 +15,16 @@
 	}
 
 	function textAreaReady() {
-		<c:choose>
-		<c:when test="${notebookDTO.allowRichEditor}">
-			CKEDITOR.instances["entryText"].focus();
-		</c:when>		
-		<c:otherwise>
-			document.forms.messageForm.focusedInput.focus();
-		</c:otherwise>
-		</c:choose>
+		<c:if test="${contentEditable}">
+			<c:choose>
+			<c:when test="${notebookDTO.allowRichEditor}">
+				CKEDITOR.instances["entryText"].focus();
+			</c:when>		
+			<c:otherwise>
+				document.forms.messageForm.focusedInput.focus();
+			</c:otherwise>
+			</c:choose>
+		</c:if>
 		document.getElementById("finishButton").style.visibility = 'visible';
 	}
 	
@@ -120,7 +122,7 @@
 				<c:when test="${contentEditable}">
 					<c:choose>
 						<c:when test="${notebookDTO.allowRichEditor}">
-							<lams:CKEditor id="entryText" value="${lrnForm.entryText}" height="200" contentFolderID="${learnerContentFolder}"
+							<lams:CKEditor id="entryText" value="${messageForm.entryText}" height="200" contentFolderID="${learnerContentFolder}"
 								toolbarSet="DefaultLearner">
 							</lams:CKEditor>
 						</c:when>
@@ -133,7 +135,7 @@
 
 				<c:otherwise>
 					<div class="sbox sbox-body voffset10 bg-warning">
-						<lams:out value="${lrnForm.entryText}" />
+						<lams:out value="${messageForm.entryText}" />
 					</div>
 				</c:otherwise>
 			</c:choose>