Index: lams_tool_laqa/web/authoring/BasicContent.jsp
===================================================================
diff -u -r0a6aca952e6053ca9ef35fb5bd2e672e5d432be6 -r0550d38d2c0eb5b51a510aa4234526ce08fb5c70
--- lams_tool_laqa/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 0a6aca952e6053ca9ef35fb5bd2e672e5d432be6)
+++ lams_tool_laqa/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 0550d38d2c0eb5b51a510aa4234526ce08fb5c70)
@@ -1,4 +1,5 @@
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 
 <script type="text/javascript">
 <!-- Common Javascript functions for LAMS -->
@@ -53,8 +54,8 @@
 </div>
 <div class="form-group">
     <label for="instructions"><fmt:message key="label.authoring.instructions.col" /></label>
-    <lams:CKEditor id="instructions" value="${qaGeneralAuthoringDTO.activityInstructions}"
-    			   contentFolderID="${qaGeneralAuthoringDTO.contentFolderID}">
+    <lams:CKEditor id="instructions" value="${formBean.instructions}"
+    			   contentFolderID="${formBean.contentFolderID}">
     </lams:CKEditor>
 </div>
 
@@ -64,7 +65,7 @@
 </div>
 
 <div class="form-inline">
-	<a href="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=newQuestionBox&contentFolderID=${qaGeneralAuthoringDTO.contentFolderID}&httpSessionID=${qaGeneralAuthoringDTO.httpSessionID}&toolContentID=${qaGeneralAuthoringDTO.toolContentID}&usernameVisible=${qaGeneralAuthoringDTO.usernameVisible}&showOtherAnswers=${qaGeneralAuthoringDTO.showOtherAnswers}&lockWhenFinished=${qaGeneralAuthoringDTO.lockWhenFinished}&questionsSequenced=${qaGeneralAuthoringDTO.questionsSequenced}"/>');"
+	<a href="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=newQuestionBox&contentFolderID=${formBean.contentFolderID}&httpSessionID=${formBean.httpSessionID}&toolContentID=${formBean.toolContentID}&usernameVisible=${formBean.usernameVisible}&showOtherAnswers=${formBean.showOtherAnswers}&lockWhenFinished=${formBean.lockWhenFinished}&questionsSequenced=${formBean.questionsSequenced}"/>');"
 		id="addTopic" class="btn btn-default btn-sm"><i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.add.new.question" /> 
 	</a>
 </div>