Index: lams_tool_lamc/web/authoring/BasicContent.jsp
===================================================================
diff -u -r7db22881fda5bae3aaedb73407b1589e71c0404a -r463f7b3dbb88ee41210f7170dc19dc25360cd26f
--- lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 7db22881fda5bae3aaedb73407b1589e71c0404a)
+++ lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 463f7b3dbb88ee41210f7170dc19dc25360cd26f)
@@ -1,34 +1,24 @@
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+<c:set var="sessionMap" value="${sessionScope[sessionMapId]}" />
 
 <script type="text/javascript">
-	
 	function removeQuestion(questionIndex) {
 		document.McAuthoringForm.questionIndex.value=questionIndex;
 		document.McAuthoringForm.dispatch.value='removeQuestion'; 
 		
 		$('#authoringForm').ajaxSubmit({ 
     		target:  $('#resourceListArea'),
+    		data: { 
+				sessionMapId: '${sessionMapId}'
+			},
     		iframe: true,
     		success:    function() { 
     			document.McAuthoringForm.dispatch.value="submitAllContent";
     			refreshThickbox();
     	    }
 	    });
 	}
-	
-	function removeMonitoringQuestion(questionIndex) {
-		document.McMonitoringForm.questionIndex.value=questionIndex;
-		document.McMonitoringForm.dispatch.value='removeQuestion'; 
-		
-		$('#monitoringForm').ajaxSubmit({ 
-    		target:  $('#resourceListArea'),
-    		iframe: true,
-    		success:    function() { 
-    			document.McMonitoringForm.dispatch.value="submitAllContent";
-    			refreshThickbox();
-    	    }
-	    });
-	}
 
 	function refreshThickbox(){
 		tb_init('a.thickbox, area.thickbox, input.thickbox');//pass where to apply thickbox
@@ -42,40 +32,40 @@
     function saveQTI(formHTML, formName) {
     	document.body.innerHTML += formHTML;
     	var form = document.getElementById(formName);
-    	form.action = '<html:rewrite page="/authoring.do?dispatch=saveQTI&contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&toolContentID=${mcGeneralAuthoringDTO.toolContentID}"/>';
+    	form.action = '<html:rewrite page="/authoring.do?dispatch=saveQTI&sessionMapId=${sessionMapId}"/>';
     	form.submit();
     }
     
     function exportQTI() {
     	var frame = document.getElementById("downloadFileDummyIframe"),
     		title = encodeURIComponent(document.getElementsByName("title")[0].value);
-    	frame.src = '<html:rewrite page="/authoring.do?dispatch=exportQTI&httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}" />'
+    	frame.src = '<html:rewrite page="/authoring.do?dispatch=exportQTI&sessionMapId=${sessionMapId}" />'
     			+ '&title=' + title;
     }
- 
 </script>
 
 <html:hidden property="questionIndex" />
 
 <div class="form-group">
     <label for="title"><fmt:message key="label.authoring.title.col"/></label>
-    <html:text property="title" styleClass="form-control"></html:text>
+    <html:text property="title" styleClass="form-control"/>
 </div>
+
 <div class="form-group">
     <label for="instructions"><fmt:message key="label.authoring.instructions.col" /></label>
-    <lams:CKEditor id="instructions" value="${mcGeneralAuthoringDTO.activityInstructions}" contentFolderID="${mcGeneralAuthoringDTO.contentFolderID}"></lams:CKEditor>
+    <lams:CKEditor id="instructions" value="${formBean.instructions}" contentFolderID="${sessionMap.contentFolderID}"/>
 </div>
 
 <div id="resourceListArea">
 	<%@ include file="/authoring/itemlist.jsp"%>
 </div>
   
 <p>
-	<a href="<html:rewrite page="/authoring.do"/>?dispatch=newQuestionBox&contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&toolContentID=${mcGeneralAuthoringDTO.toolContentID}&sln=${mcGeneralAuthoringDTO.sln}&showMarks=${mcGeneralAuthoringDTO.showMarks}&randomize=${mcGeneralAuthoringDTO.randomize}&questionsSequenced=${mcGeneralAuthoringDTO.questionsSequenced}&retries=${mcGeneralAuthoringDTO.retries}&KeepThis=true&TB_iframe=true&modal=true"
+	<a href="<html:rewrite page="/authoring.do"/>?dispatch=newQuestionBox&sessionMapId=${sessionMapId}&sln=${mcGeneralAuthoringDTO.sln}&showMarks=${mcGeneralAuthoringDTO.showMarks}&randomize=${mcGeneralAuthoringDTO.randomize}&questionsSequenced=${mcGeneralAuthoringDTO.questionsSequenced}&retries=${mcGeneralAuthoringDTO.retries}&KeepThis=true&TB_iframe=true&modal=true"
 		class="btn btn-default btn-sm thickbox"> 
 		<i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.save.question" /> 
 	</a>
-	</p>
+</p>
 
 <!-- For exporting QTI packages -->
 <iframe id="downloadFileDummyIframe" style="display: none;"></iframe>