Index: lams_tool_laqa/web/authoring/BasicContent.jsp
===================================================================
diff -u -ra432485ce7201b33ef05fb9ceedfd9355e68674f -r7b5e281a656074e861c4d76feb9c01c3c82c426b
--- lams_tool_laqa/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision a432485ce7201b33ef05fb9ceedfd9355e68674f)
+++ lams_tool_laqa/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 7b5e281a656074e861c4d76feb9c01c3c82c426b)
@@ -27,7 +27,6 @@
 <%@ taglib uri="fck-editor" prefix="FCK" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
- 
 		           <h2><font size=2> <b> <bean:message key="label.authoring.qa.basic"/> </b></font></h2>
 		        	<table align=center> 	  
 						<tr>   
@@ -52,15 +51,15 @@
 						<tr> 
 					 		<td valign="top"><font size=2> <b> <bean:message key="label.authoring.title"/>: </b></font> </td>
 							<td NOWRAP valign=top>
-								<lams:SetEditor id="title" text="${QaAuthoringForm.title}" small="true"/>								
+								<lams:SetEditor id="title" text="${activityTitle}" small="true"/>								
 							</td> 
 							
 					  	</tr>
 
 					  	<tr> 
 					 		<td valign="top"><font size=2> <b> <bean:message key="label.authoring.instructions"/>:  </b></font></td>
 							<td NOWRAP valign=top>
-								<lams:SetEditor id="instructions" text="${QaAuthoringForm.instructions}" small="true"/>								
+								<lams:SetEditor id="instructions" text="${activityInstructions}" small="true"/>								
 							</td> 
 						</tr>
 				
@@ -89,11 +88,21 @@
 
 										<lams:SetEditor id="questionContent${queIndex-1}" text="${questionEntry.value}" small="true"/>								
                                 
-		 		 						<html:submit property="removeContent" 
-                                                     styleClass="linkbutton"  
-                                                     onclick="removeQuestion(${queIndex});">
-											<bean:message key="button.removeQuestion"/>
-										</html:submit>
+	                                	<c:if test="${ (sessionScope.activeModule != 'monitoring') }"> 			
+			 		 						<html:submit property="removeContent" 
+	                                                     styleClass="linkbutton"  
+	                                                     onclick="removeQuestion(${queIndex});">
+												<bean:message key="button.removeQuestion"/>
+											</html:submit>
+										</c:if> 			
+	                                	<c:if test="${ (sessionScope.activeModule == 'monitoring') }"> 			
+			 		 						<html:submit property="removeContent" 
+	                                                     styleClass="linkbutton"  
+	                                                     onclick="removeMonitoringQuestion(${queIndex});">
+												<bean:message key="button.removeQuestion"/>
+											</html:submit>
+										</c:if> 													
+										
                                     </td>
 								  </tr>
 							</c:if> 			
@@ -127,6 +136,12 @@
 		document.QaAuthoringForm.questionIndex.value=questionIndex;
         submitMethod('removeQuestion');
 	}
+
+	function removeMonitoringQuestion(questionIndex)
+	{
+		document.QaMonitoringForm.questionIndex.value=questionIndex;
+        submitMonitoringMethod('removeQuestion');
+	}
 	
  </SCRIPT>