Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java
===================================================================
diff -u -reeb8faaea5372ccf5445d7172f726931e9f26098 -r8b96d871bf93fc27f6f6d086977dc8c95d5e7f90
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision eeb8faaea5372ccf5445d7172f726931e9f26098)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 8b96d871bf93fc27f6f6d086977dc8c95d5e7f90)
@@ -160,10 +160,10 @@
 	    if (userAndReflection.length > 1 && userAndReflection[1] != null) {
 		responseRow.put(NotebookConstants.PARAM_ENTRY, HtmlUtils.htmlEscape((String) userAndReflection[1]));
 	    }
-//	    if (user.getTeachersComment() != null && user.getTeachersComment().length() > 0) {
-//		responseRow.put(NotebookConstants.PARAM_COMMENT,
-//			HtmlUtils.htmlEscape((String) user.getTeachersComment()));
-//	    }
+	    if (user.getTeachersComment() != null && user.getTeachersComment().length() > 0) {
+		responseRow.put(NotebookConstants.PARAM_COMMENT,
+			HtmlUtils.htmlEscape((String) user.getTeachersComment()));
+	    }
 
 	    if (userAndReflection.length > 2 && userAndReflection[2] != null) {
 		Date modifiedDate = (Date) userAndReflection[2];
Index: lams_tool_notebook/web/pages/monitoring/editActivity.jsp
===================================================================
diff -u -r58448aa728e808e025d15546ea5375e6db321ff3 -r8b96d871bf93fc27f6f6d086977dc8c95d5e7f90
--- lams_tool_notebook/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision 58448aa728e808e025d15546ea5375e6db321ff3)
+++ lams_tool_notebook/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision 8b96d871bf93fc27f6f6d086977dc8c95d5e7f90)
@@ -28,13 +28,11 @@
 	</tr>
 </table>
 
-<c:if test='${!dto.contentInUse}'>
-	<c:url value="/authoring.do" var="authoringUrl">
-		<c:param name="toolContentID" value="${dto.toolContentId}" />
-		<c:param name="mode" value="teacher" />
-		<c:param name="contentFolderID" value="${contentFolderID}" />
-	</c:url>
-	<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default pull-right">
-		<fmt:message key="button.editActivity" />
-	</html:link>
-</c:if>
+<c:url value="/authoring.do" var="authoringUrl">
+	<c:param name="toolContentID" value="${dto.toolContentId}" />
+	<c:param name="mode" value="teacher" />
+	<c:param name="contentFolderID" value="${contentFolderID}" />
+</c:url>
+<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default pull-right">
+	<fmt:message key="button.editActivity" />
+</html:link>
Index: lams_tool_notebook/web/pages/monitoring/summary.jsp
===================================================================
diff -u -reeb8faaea5372ccf5445d7172f726931e9f26098 -r8b96d871bf93fc27f6f6d086977dc8c95d5e7f90
--- lams_tool_notebook/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision eeb8faaea5372ccf5445d7172f726931e9f26098)
+++ lams_tool_notebook/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 8b96d871bf93fc27f6f6d086977dc8c95d5e7f90)
@@ -114,13 +114,12 @@
  					$('<div/>', {
  						"class": "user-entry editable${sessionId}_" + rowId + "_t comment-area",
  						"data-type": "textarea",
- 						"data-checkbox-label": "<fmt:message key='label.notify.learner' />",
- 					    html: comment
- 					}).appendTo(subgrid);
- 					
+ 						"data-checkbox-label": "<fmt:message key='label.notify.learner' />"
+ 					}).text(comment).appendTo(subgrid); 
+  					
  					$(".editable${sessionId}_" + rowId + "_t").jinplace({
  					    url: "<c:url value='/monitoring.do'/>?dispatch=saveTeacherComment&userUid=" + userUid,
- 					    textOnly: false,
+ 					    textOnly: true,
  					    placeholder: '<fmt:message key="label.click.to.edit" />',
  					    okButton: "<fmt:message key='button.ok' />",
  					    cancelButton: "<fmt:message key='button.cancel' />"