Index: lams_tool_laqa/web/authoring/BasicContent.jsp
===================================================================
diff -u -r30f4ae75c5141459f9a2fa3e9b5c3d103a899528 -r017eb6f2c73d24ed7eb42d16058b8c2b5737d0bf
--- lams_tool_laqa/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 30f4ae75c5141459f9a2fa3e9b5c3d103a899528)
+++ lams_tool_laqa/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 017eb6f2c73d24ed7eb42d16058b8c2b5737d0bf)
@@ -81,18 +81,11 @@
 										<lams:SetEditor id="questionContent${queIndex-1}" text="${questionEntry.value}"  key="label.question.col"/>								
                                 
 	                                	<c:if test="${ (qaGeneralAuthoringDTO.activeModule != 'monitoring') }"> 			
-			 		 						<html:submit property="removeContent" 
-	                                                     styleClass="linkbutton"  
-	                                                     onclick="removeQuestion(${queIndex});">
-												<bean:message key="button.removeQuestion"/>
-											</html:submit>
+											<img src="<c:out value="${tool}"/>images/delete.gif" align=left onclick="removeQuestion(${queIndex});">												
 										</c:if> 			
+										
 	                                	<c:if test="${ (qaGeneralAuthoringDTO.activeModule == 'monitoring') }"> 			
-			 		 						<html:submit property="removeContent" 
-	                                                     styleClass="linkbutton"  
-	                                                     onclick="removeMonitoringQuestion(${queIndex});">
-												<bean:message key="button.removeQuestion"/>
-											</html:submit>
+											<img src="<c:out value="${tool}"/>images/delete.gif" align=left onclick="removeMonitoringQuestion(${queIndex});">																							
 										</c:if> 													
 										
                                     </td>
@@ -108,26 +101,33 @@
                                 <html:submit property="addContent" 
                                              styleClass="linkbutton" 
                                              onclick="submitMethod('addNewQuestion');">
-                                    <bean:message key="button.addNewQuestion"/>
+                                    <bean:message key="label.add.question"/>
                                 </html:submit>
                             </td>
                         </tr>
 					
 					</table>
 
-
-	      	<c:if test="${qaGeneralAuthoringDTO.activeModule != 'authoring'}"> 					
-				<p align="right">
-				    <a href="javascript:submitMethod('submitAllContent')" class="button">
-			        	<bean:message key="label.save"/></a>
-				</p>
-			</c:if> 					
-
-	      	<c:if test="${qaGeneralAuthoringDTO.activeModule == 'authoring'}"> 					
-				<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-				<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="laqa11" 
-				cancelButtonLabelKey="label.cancel" saveButtonLabelKey="label.save" toolContentID="${formBean.toolContentID}" />
-			</c:if> 						      	
+					<table>
+					    <tr> <td> &nbsp </td> </tr>					    
+						<tr> 
+							<td>							
+						      	<c:if test="${qaGeneralAuthoringDTO.activeModule != 'authoring'}"> 					
+									<p align="right">
+									    <a href="javascript:submitMethod('submitAllContent')" class="button">
+								        	<bean:message key="label.save"/></a>
+									</p>
+								</c:if> 					
+					
+					
+						      	<c:if test="${qaGeneralAuthoringDTO.activeModule == 'authoring'}"> 					
+									<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+									<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="laqa11" 
+									cancelButtonLabelKey="label.cancel" saveButtonLabelKey="label.save" toolContentID="${formBean.toolContentID}" />
+								</c:if> 						      	
+							</td> 
+					  	</tr>
+				 </table>
 	      				
 
 <SCRIPT language="JavaScript">