Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/LearningController.java
===================================================================
diff -u -re062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf -r05f1961fd1d7e74738595255cfdb13e344c40123
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/LearningController.java	(.../LearningController.java)	(revision e062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/LearningController.java	(.../LearningController.java)	(revision 05f1961fd1d7e74738595255cfdb13e344c40123)
@@ -463,6 +463,49 @@
 	return "jsps/learning/viewtopic";
     }
 
+    @RequestMapping("/viewTopicNext")
+    public String viewTopicNext(HttpServletRequest request) {
+
+	forumService = getForumManager();
+
+	Long rootTopicId = WebUtil.readLongParam(request, ForumConstants.ATTR_TOPIC_ID);
+
+	String sessionMapID = WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	sessionMap.put(ForumConstants.ATTR_ROOT_TOPIC_UID, rootTopicId);
+
+	// get forum user and forum
+	// if coming from topic list, the toolSessionId is in the SessionMap.
+	// if coming from the monitoring statistics window, it is passed in as a parameter.
+	Long toolSessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID, true);
+	if (toolSessionId != null) {
+	    sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, toolSessionId);
+	    String mode = WebUtil.readStrParam(request, AttributeNames.PARAM_MODE, true);
+	    if (mode != null) {
+		sessionMap.put(AttributeNames.PARAM_MODE, mode);
+	    }
+	} else {
+	    toolSessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+	}
+	ForumUser forumUser = getCurrentUser(request, toolSessionId);
+	Forum forum = forumUser.getSession().getForum();
+
+	Long lastMsgSeqId = WebUtil.readLongParam(request, ForumConstants.PAGE_LAST_ID, true);
+	Long pageSize = WebUtil.readLongParam(request, ForumConstants.PAGE_SIZE, true);
+
+	setupViewTopicPagedDTOList(request, rootTopicId, sessionMapID, forumUser, forum, lastMsgSeqId, pageSize);
+
+	// Should we show the reflection or not? We shouldn't show it when the View Forum screen is accessed
+	// from the Monitoring Summary screen, but we should when accessed from the Learner Progress screen.
+	// Need to constantly past this value on, rather than hiding just the once, as the View Forum
+	// screen has a refresh button. Need to pass it through the view topic screen and dependent screens
+	// as it has a link from the view topic screen back to View Forum screen.
+	boolean hideReflection = WebUtil.readBooleanParam(request, ForumConstants.ATTR_HIDE_REFLECTION, false);
+	sessionMap.put(ForumConstants.ATTR_HIDE_REFLECTION, hideReflection);
+
+	return "jsps/learning/message/topicviewwrapper";
+    }
+
     private void setupViewTopicPagedDTOList(HttpServletRequest request, Long rootTopicId, String sessionMapID,
 	    ForumUser forumUser, Forum forum, Long lastMsgSeqId, Long pageSize) {
 	// get root topic list
Index: lams_tool_forum/web/jsps/authoring/addCondition.jsp
===================================================================
diff -u -re062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf -r05f1961fd1d7e74738595255cfdb13e344c40123
--- lams_tool_forum/web/jsps/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision e062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf)
+++ lams_tool_forum/web/jsps/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision 05f1961fd1d7e74738595255cfdb13e344c40123)
@@ -24,7 +24,7 @@
 			
 			<div class="form-group">
 			    <label for="displayName"><fmt:message key="label.authoring.conditions.condition.name" /> *</label>
-			    <input type="text" tabindex="1" path="displayName" size="51" class="form-control"/>
+			    <input type="text" tabindex="1" name="displayName" value="${forumConditionForm.displayName}" size="51" class="form-control"/>
 			</div>
 
 			<%-- Text search form fields are being included --%>
@@ -34,8 +34,8 @@
 			<c:forEach var="itemE" items="${forumConditionForm.possibleItems}">
 		    	<div class="checkbox">
 		    	<label>
-		    	<form:checkbox path="selectedItems" value="${itemE.key}"/>
-		    		<c:out value="${itemE.value}" />
+		    	<form:checkbox path="selectedItems" value="${itemE.value}"/>
+		    		<c:out value="${itemE.key}" />
 		    	</label>
 				</div>
 		    	</c:forEach>
Index: lams_tool_forum/web/jsps/authoring/basic.jsp
===================================================================
diff -u -re062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf -r05f1961fd1d7e74738595255cfdb13e344c40123
--- lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision e062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf)
+++ lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision 05f1961fd1d7e74738595255cfdb13e344c40123)
@@ -131,13 +131,13 @@
 		}
 
 		showBusy("itemAttachmentArea");
-		var formData = new FormData(document.getElementById("topicFormId"));
+		var formData = new FormData(document.getElementById("messageForm"));
 	    $.ajax({ // create an AJAX call...
 			data: formData, 
 	        processData: false, // tell jQuery not to process the data
 	        contentType: false, // tell jQuery not to set contentType
-           	type: $("#topicFormId").attr('method'),
-			url: $("#topicFormId").attr('action'),
+           	type: $("#messageForm").attr('method'),
+			url: $("#messageForm").attr('action'),
 			success: function(data) {
                	$('#messageArea').html(data);
 	       		hideBusy("itemAttachmentArea");
Index: lams_tool_forum/web/jsps/authoring/conditions.jsp
===================================================================
diff -u -re062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf -r05f1961fd1d7e74738595255cfdb13e344c40123
--- lams_tool_forum/web/jsps/authoring/conditions.jsp	(.../conditions.jsp)	(revision e062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf)
+++ lams_tool_forum/web/jsps/authoring/conditions.jsp	(.../conditions.jsp)	(revision 05f1961fd1d7e74738595255cfdb13e344c40123)
@@ -49,12 +49,12 @@
 <!-- Conditions Tab Content -->
 
 <div id="conditionsArea">
-	<c:set var="sessionMapID" value="${forumConditionForm.sessionMapID}" />
+	<c:set var="sessionMapID" value="${forumForm.sessionMapID}" />
 	<%@ include file="/jsps/authoring/conditionList.jsp"%>
 </div>
  
  <div class="form-inline">
-	<a href="javascript:showConditionMessage(<lams:WebAppURL />authoringCondition/newConditionInit.do?sessionMapID=${forumConditionForm.sessionMapID});" class="btn btn-default btn-sm">
+	<a href="javascript:showConditionMessage('<lams:WebAppURL />authoringCondition/newConditionInit.do?sessionMapID=${forumForm.sessionMapID}');" 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_forum/web/jsps/authoring/message/topiclist.jsp
===================================================================
diff -u -re062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf -r05f1961fd1d7e74738595255cfdb13e344c40123
--- lams_tool_forum/web/jsps/authoring/message/topiclist.jsp	(.../topiclist.jsp)	(revision e062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf)
+++ lams_tool_forum/web/jsps/authoring/message/topiclist.jsp	(.../topiclist.jsp)	(revision 05f1961fd1d7e74738595255cfdb13e344c40123)
@@ -12,7 +12,7 @@
 			<tr id="row${status.index}">
 				<td>
 					<c:set var="viewtopic">
-						<lams:WebAppURL />authoring/viewTopic.do?sessionMapID=${sessionMapID}&topicIndex=${status.index}&create=${topic.message.updated.time}
+						<lams:WebAppURL />learning/viewTopic.do?sessionMapID=${sessionMapID}&topicIndex=${status.index}&create=${topic.message.updated.time}
 					</c:set> 
 						
 					<c:out value="${topic.message.subject}" />
Index: lams_tool_forum/web/jsps/learning/message/bodyarea.jsp
===================================================================
diff -u -re062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf -r05f1961fd1d7e74738595255cfdb13e344c40123
--- lams_tool_forum/web/jsps/learning/message/bodyarea.jsp	(.../bodyarea.jsp)	(revision e062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf)
+++ lams_tool_forum/web/jsps/learning/message/bodyarea.jsp	(.../bodyarea.jsp)	(revision 05f1961fd1d7e74738595255cfdb13e344c40123)
@@ -5,21 +5,22 @@
 
 	<c:choose>
 		<c:when test="${sessionMap.allowRichEditor}">
-			<lams:CKEditor id="message.body" value="${messageForm.message.body}" 
+			<lams:CKEditor id="message.body" value="${message.body}" 
 					contentFolderID="${sessionMap.learnerContentFolder}" toolbarSet="DefaultLearner">
 			</lams:CKEditor>
 		</c:when>
 		
 		<c:otherwise>
 			<%-- Does not user general tag because this field need keep compatible with CKEditor's content --%>
-			<textarea rows="10" class="form-control" tabindex="2" name="message.body"/> 
+			<textarea rows="10" class="form-control" tabindex="2" name="message.body">${message.body}</textarea> 
 		</c:otherwise>
 	</c:choose>
  
 	<c:if test="${sessionMap.allowAnonym || sessionMap.maxCharacters > 0 || sessionMap.minCharacters > 0}">
 	<div class="row voffset10">
 
 	<div class="col-xs-12 col-sm-6">
+	
 	<%-- If limitChars == 0, then we don't want to limit the characters at all. --%>
 	<c:if test="${sessionMap.maxCharacters > 0}">
 
Index: lams_tool_forum/web/jsps/learning/notebook.jsp
===================================================================
diff -u -re062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf -r05f1961fd1d7e74738595255cfdb13e344c40123
--- lams_tool_forum/web/jsps/learning/notebook.jsp	(.../notebook.jsp)	(revision e062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf)
+++ lams_tool_forum/web/jsps/learning/notebook.jsp	(.../notebook.jsp)	(revision 05f1961fd1d7e74738595255cfdb13e344c40123)
@@ -53,13 +53,13 @@
 				document.getElementById("finishButton").disabled = true;
 			}
 			function submitForm(methodName){
-		        	var f = document.getElementById('messageForm');
+		        	var f = document.getElementById('reflectionForm');
 			        f.submit();
 		        }
 		</script>
 		
 		<form:form action="submitReflection.do" method="post"
-			onsubmit="disableFinishButton();" modelAttribute="messageForm" id="messageForm">
+			onsubmit="disableFinishButton();" modelAttribute="reflectionForm" id="reflectionForm">
 			<form:hidden path="userID" />
 			<form:hidden path="sessionMapID" />
 		
@@ -71,7 +71,7 @@
 					<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true" />
 				</p>
 		
-				<textarea id="focused" rows="5" name="entryText" class="form-control"></textarea>
+				<textarea id="focused" rows="5" name="entryText" class="form-control">${reflectionForm.entryText}</textarea>
 		
 				<div class="space-bottom-top align-right">
 					<a  href="#nogo" class="btn btn-primary voffset5 pull-right na" id="finishButton" onclick="submitForm('finish')">
Index: lams_tool_forum/web/jsps/learning/reply.jsp
===================================================================
diff -u -re062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf -r05f1961fd1d7e74738595255cfdb13e344c40123
--- lams_tool_forum/web/jsps/learning/reply.jsp	(.../reply.jsp)	(revision e062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf)
+++ lams_tool_forum/web/jsps/learning/reply.jsp	(.../reply.jsp)	(revision 05f1961fd1d7e74738595255cfdb13e344c40123)
@@ -95,7 +95,7 @@
 			        			if ( ! threadDiv) {
 			        				alert('<fmt:message key="error.cannot.redisplay.please.refresh"/>');
 		        				} else {
-			        				var loadString = "<lams:WebAppURL />learning/viewTopicThread.do?topicID="" + rootUid + "&sessionMapID=" + response.sessionMapID + "&threadUid=" + threadUid+"&messageUid="+messageUid;
+			        				var loadString = "<lams:WebAppURL />learning/viewTopicThread.do?topicID=" + rootUid + "&sessionMapID=" + response.sessionMapID + "&threadUid=" + threadUid+"&messageUid="+messageUid;
 			        				$.ajaxSetup({ cache: true });
 									$(threadDiv).load(loadString, function() {
 										setupJRating("<c:url value='/learning/rateMessage.do'/>?toolSessionID=${sessionMap.toolSessionID}&sessionMapID=${sessionMapID}");
Index: lams_tool_forum/web/jsps/learning/viewforum.jsp
===================================================================
diff -u -re062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf -r05f1961fd1d7e74738595255cfdb13e344c40123
--- lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision e062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf)
+++ lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision 05f1961fd1d7e74738595255cfdb13e344c40123)
@@ -56,7 +56,7 @@
 			<lams:WebAppURL />learning/finish.do?sessionMapID=${sessionMapID}
 		</c:set>
 		<c:set var="refresh">
-			<lams:WebAppURL />learning/viewForum.do?mode=${sessionMap.mode}&toolSessionID=${sessionMap.toolSessionID}&sessionMapID=${sessionMapID}&hideReflection=${sessionMap.hideReflection}"
+			<lams:WebAppURL />learning/viewForum.do?mode=${sessionMap.mode}&toolSessionID=${sessionMap.toolSessionID}&sessionMapID=${sessionMapID}&hideReflection=${sessionMap.hideReflection}
 		</c:set>
 		
 		<script type="text/javascript">
Index: lams_tool_forum/web/jsps/learning/viewtopic.jsp
===================================================================
diff -u -re062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf -r05f1961fd1d7e74738595255cfdb13e344c40123
--- lams_tool_forum/web/jsps/learning/viewtopic.jsp	(.../viewtopic.jsp)	(revision e062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf)
+++ lams_tool_forum/web/jsps/learning/viewtopic.jsp	(.../viewtopic.jsp)	(revision 05f1961fd1d7e74738595255cfdb13e344c40123)
@@ -50,10 +50,12 @@
 			function setupJRatingSetPath() {
 				setupJRating("<c:url value='/learning/rateMessage.do'/>?toolSessionID=${sessionMap.toolSessionID}&sessionMapID=${sessionMapID}");
 			}
-			
+			<c:set var="refresh">
+			<lams:WebAppURL />learning/viewTopic.do?sessionMapID=${sessionMapID}&topicID=${sessionMap.rootUid}&hideReflection=${sessionMap.hideReflection}&pageLastId=0&size=${pageSize}&reqUid=${reqIDVar.getTime()};
+		</c:set>
 			function refreshTopic(){
 				var reqIDVar = new Date();
-				location.href= "<lams:WebAppURL />learning/viewTopic.do?sessionMapID=${sessionMapID}&topicID=${sessionMap.rootUid}&hideReflection=${sessionMap.hideReflection}&pageLastId=0&size=${pageSize}&reqUid="+reqIDVar.getTime();;
+				location.href= '${refresh}';
 			}
 		</script>
 
Index: lams_tool_forum/web/jsps/monitoring/viewactivity.jsp
===================================================================
diff -u -re062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf -r05f1961fd1d7e74738595255cfdb13e344c40123
--- lams_tool_forum/web/jsps/monitoring/viewactivity.jsp	(.../viewactivity.jsp)	(revision e062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf)
+++ lams_tool_forum/web/jsps/monitoring/viewactivity.jsp	(.../viewactivity.jsp)	(revision 05f1961fd1d7e74738595255cfdb13e344c40123)
@@ -1,5 +1,14 @@
 <%@ include file="/common/taglibs.jsp"%>
 
+ <c:set var="errorKey" value="GLOBAL" />
+ <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:forEach>
+	 </lams:Alert>
+</c:if>
+					        
 <table cellpadding="0">
 	<!-- Title Row -->
 	<tr>
@@ -24,7 +33,7 @@
 
 	<tr>
 		<td colspan="2">
-			<a forward="forwardToAuthorPage" class="button">
+			<a href="/learning/viewTopic.do" class="button">
 				<fmt:message key="label.monitoring.edit.activity.edit" />
 			</a>
 		</td>