Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java,v
diff -u -r1.26.2.1 -r1.26.2.2
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java	12 Jan 2016 12:24:32 -0000	1.26.2.1
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java	27 Jan 2016 07:03:45 -0000	1.26.2.2
@@ -216,16 +216,13 @@
 	
 	public void copyValuesIntoNbContent(NoticeboardContent nbContent)
 	{
-		nbContent.setTitle(getTitle());
+	    nbContent.setTitle(getTitle());
 	    nbContent.setContent(getBasicContent());
-		nbContent.setAllowComments(isAllowComments());
-		nbContent.setCommentsLikeAndDislike(isCommentsLikeAndDislike());
-	    if (defineLater == null || defineLater.length() == 0) {
-	    	// ie. If defineLater is null or empty, this means we are in authoring
-			nbContent.setReflectOnActivity(getReflectOnActivity());
-			nbContent.setReflectInstructions(getReflectInstructions());
-			nbContent.setDateUpdated(new Date(System.currentTimeMillis()));
-	    }
+	    nbContent.setAllowComments(isAllowComments());
+	    nbContent.setCommentsLikeAndDislike(isCommentsLikeAndDislike());
+	    nbContent.setReflectOnActivity(getReflectOnActivity());
+	    nbContent.setReflectInstructions(getReflectInstructions());
+	    nbContent.setDateUpdated(new Date(System.currentTimeMillis()));
 	}
 	
 	public String getCurrentTab() {
Index: lams_tool_nb/web/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/authoring/authoring.jsp,v
diff -u -r1.24.2.1 -r1.24.2.2
--- lams_tool_nb/web/authoring/authoring.jsp	12 Jan 2016 12:24:32 -0000	1.24.2.1
+++ lams_tool_nb/web/authoring/authoring.jsp	27 Jan 2016 07:03:45 -0000	1.24.2.2
@@ -72,9 +72,7 @@
 				<!-- start tabs -->
 				<lams:Tabs control="true">
 					<lams:Tab id="1" key="label.authoring.heading.basic" />
-					<c:if test="${formBean.defineLater != 'true'}">
-						<lams:Tab id="2" key="label.authoring.heading.advanced" />
-					</c:if>
+					<lams:Tab id="2" key="label.authoring.heading.advanced" />
 				</lams:Tabs>
 				<!-- end tab buttons -->
 			</div>
@@ -94,10 +92,8 @@
 				<!--  Set up tabs  -->
 				<lams:TabBody id="1" titleKey="label.authoring.heading.basic"
 					page="basic.jsp" />
-				<c:if test="${formBean.defineLater != 'true'}">
-					<lams:TabBody id="2" titleKey="label.authoring.heading.advanced"
+				<lams:TabBody id="2" titleKey="label.authoring.heading.advanced"
 						page="advance.jsp" />
-				</c:if>
 
 				<!-- Button Row -->
 				<html:hidden property="method" value="save" />
Index: lams_tool_nb/web/monitoring/comments.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/monitoring/comments.jsp,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_tool_nb/web/monitoring/comments.jsp	12 Jan 2016 12:24:32 -0000	1.1.2.2
+++ lams_tool_nb/web/monitoring/comments.jsp	27 Jan 2016 07:03:45 -0000	1.1.2.3
@@ -14,6 +14,7 @@
 <lams:html>
 <lams:head>
 	<lams:css />
+	<script src="${lams}includes/javascript/jquery.js"></script>
 	<title><fmt:message key="activity.title"/></title>
 </lams:head>