Index: lams_tool_lamc/web/authoringMaincontent.jsp
===================================================================
diff -u -r2dbeea64b0b9925ebfcc5b10ced841ad134a0f38 -rae0187efb730cbc88827a52b23620dbdc8172166
--- lams_tool_lamc/web/authoringMaincontent.jsp	(.../authoringMaincontent.jsp)	(revision 2dbeea64b0b9925ebfcc5b10ced841ad134a0f38)
+++ lams_tool_lamc/web/authoringMaincontent.jsp	(.../authoringMaincontent.jsp)	(revision ae0187efb730cbc88827a52b23620dbdc8172166)
@@ -98,162 +98,9 @@
 </tr> 
 </table>
 
+<h2>Please define questions </h2>
 <div id="formtablecontainer">
-					<table class="forms" align=left>
- 						<tr> 
-					 		<td class="formlabel"> <bean:message key="label.authoring.title"/>: </td>
-							<td class="formcontrol">
-								<FCK:editor id="richTextTitle" basePath="/lams/fckeditor/">
-									  <c:out value="${sessionScope.richTextTitle}" escapeXml="false" />						  
-								</FCK:editor>
-							</td> 
-					  	</tr>
-					  	
-					  	<tr> 
-					 		<td class="formlabel"> <bean:message key="label.authoring.instructions"/>: </td>
-							<td class="formcontrol">
-								<FCK:editor id="richTextInstructions" basePath="/lams/fckeditor/">
-									  <c:out value="${sessionScope.richTextInstructions}" escapeXml="false" />						  
-								</FCK:editor>
-							</td>
-						</tr>
-				
-					<tr>
-					 	<td colspan=2 align=center>								
-							&nbsp&nbsp
-					  	</td>
-					</tr>
-				
-					<tr> <td colspan=2 align=center>
-					
-					<table align=center>
-					<tr>
-						<td class="formlabel">
-						</td>
-						<td class="input" align="center">
-							<h5> <b> <bean:message key="label.Questions"/> </b> </h5>
-						</td>
-						<td class="input" align="center">
-							<h5> <b> <bean:message key="label.weight"/> </b> </h5>
-						</td>
-						<td class="input" colspan=2 align="center">
-							<h5> <b> <bean:message key="label.actions"/> </b> </h5>
-						</td>
-					</tr>
-			  	 		<c:set var="queIndex" scope="session" value="1"/>
-						<c:forEach var="questionEntry" items="${sessionScope.mapQuestionsContent}">
-									<c:if test="${questionEntry.key == 1}"> 			
-									    <tr>
-										  	<td class="formlabel"> <c:out value="Question ${queIndex}"/> : </td>
-										  	
-									  		<td class="input"> 
-									  			<input type="text" name="questionContent<c:out value="${queIndex}"/>" value="<c:out value="${questionEntry.value}"/>"
-										  		size="50" maxlength="255" >
-										  	</td>
-
-                                            <td class="input" align=center>										  	
-												<c:forEach var="weightsEntry" items="${sessionScope.mapWeights}">                                            
-														<c:if test="${questionEntry.key == weightsEntry.key}"> 			
-													  			<input type="text" name="questionWeight<c:out value="${queIndex}"/>" value="<c:out value="${weightsEntry.value}"/>"
-														  		size="3" maxlength="3">
-														</c:if>
-												</c:forEach>
-                                            </td>
-
-                                                   
-                                            <td class="input">										  	
-			  										<html:submit property="addQuestion" styleClass="linkbutton" 
-													onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
-														<bean:message key="button.addNewQuestion"/>
-													</html:submit>
-											</td>	
-											&nbsp&nbsp&nbsp
-                                            <td class="input">										  	
-					 								<html:submit property="editOptions" styleClass="linkbutton"  onclick="javascript:document.forms[0].questionIndex.value=${queIndex};"
-					 								onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
-														<bean:message key="label.edit"/>
-													</html:submit>
-											</td>
-										  </tr>
-									</c:if> 			
-									
-							  		<c:if test="${questionEntry.key > 1}"> 			
-										<c:set var="queIndex" scope="session" value="${queIndex +1}"/>
-										  <tr>
-										  	<td class="formlabel"> <c:out value="Question ${queIndex}"/> : </td>
-										  	
-										  		<td class="input"> 
-										  			<input type="text" name="questionContent<c:out value="${queIndex}"/>" value="<c:out value="${questionEntry.value}"/>"  size="50" maxlength="255" > 
-												</td>											
-
-	                                            <td class="input" align=center>										  	
-													<c:forEach var="weightsEntry" items="${sessionScope.mapWeights}">                                            
-															<c:if test="${questionEntry.key == weightsEntry.key}"> 			
-														  			<input type="text" name="questionWeight<c:out value="${queIndex}"/>" value="<c:out value="${weightsEntry.value}"/>"
-															  		size="3" maxlength="3">
-															</c:if>
-													</c:forEach>
-	                                            </td>
-											
-                                               <td class="input">										  	
-				 								<html:submit property="removeQuestion" styleClass="linkbutton"  onclick="javascript:document.forms[0].questionIndex.value=${queIndex};"
-					 								onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
-														<bean:message key="button.removeQuestion"/>
-													</html:submit>
-												</td>
-												&nbsp&nbsp&nbsp
-	                                            <td class="input">										  	
-					 								<html:submit property="editOptions" styleClass="linkbutton"  onclick="javascript:document.forms[0].questionIndex.value=${queIndex};"
-					 								onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
-														<bean:message key="label.edit"/>
-													</html:submit>
-											  	</td>
-										  </tr>
-									</c:if> 
-						</c:forEach>
-							<html:hidden property="questionIndex"/>
-
-					<tr>
-	 				 	<td colspan=5 align=center>
-							&nbsp&nbsp
-					  	</td>
-					</tr>		
-					
-					<tr>
-					  	<td class="formlabel"><bean:message key="radiobox.passmark"/>: </td>
-						<td class="input"> 
-							  <html:text property="passmark"  size="3" maxlength="3"/>							
-						</td>
-						<td> &nbsp</td> <td>&nbsp </td>
-					</tr>
-					
-					<tr>
-	 				 	<td colspan=5 align=center>
-							&nbsp&nbsp
-					  	</td>
-					</tr>
-						
-					<tr>
-	 				 	<td colspan=5 align=center>								
-							&nbsp&nbsp
-					  	</td>
-					</tr>
-
-	 				 <tr>
-	 				 	<td colspan=5 align=left>								
-							<html:submit property="submitQuestions" styleClass="linkbutton" 
-							onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
-								<bean:message key="button.submit"/>
-							</html:submit>	 				 		  										  		
-		 			  	</td>
-	 				 </tr>
-							
-					</table>		
-					</td> </tr>
-							
-
-	 				</table> 	 
-					
+		<jsp:include page="BasicContent.jsp" />
 </div>
 <hr>
 <a href="javascript:;" class="button">Cancel</a>
@@ -275,7 +122,7 @@
 <div id='content_i'  class="tabbody content_i">
 <h2>Instructions</h2>
 <div id="formtablecontainer">
-		<table class="forms">
+		<table align=center>
 				<tr> 
 					<td class="formlabel">
           				<fmt:message key="label.offlineInstructions" />:
Index: lams_tool_lamc/web/editOptionsContent.jsp
===================================================================
diff -u -r2dbeea64b0b9925ebfcc5b10ced841ad134a0f38 -rae0187efb730cbc88827a52b23620dbdc8172166
--- lams_tool_lamc/web/editOptionsContent.jsp	(.../editOptionsContent.jsp)	(revision 2dbeea64b0b9925ebfcc5b10ced841ad134a0f38)
+++ lams_tool_lamc/web/editOptionsContent.jsp	(.../editOptionsContent.jsp)	(revision ae0187efb730cbc88827a52b23620dbdc8172166)
@@ -110,39 +110,41 @@
 					  			size="50" maxlength="255"> 
 					  	</td>
 					</tr>
-						<tr>
-		 				 	<td colspan=4 align=center>								
-								&nbsp&nbsp
-						  	</td>
-						</tr>
+					<tr>
+	 				 	<td colspan=2 align=center>								
+					  	</td>
+					</tr>
 
-						<tr>
-						  	<td> </td>
-							<td class="formlabel">
-								<h5> <b> <bean:message key="label.candidateAnswers"/> </b> </h5>
 
-						  		&nbsp&nbsp&nbsp&nbsp&nbsp
+					<tr>
+					  	<td class="formlabel">  </td>
+						<td class=input colspan=3>
+							<h5> <b> <bean:message key="label.candidateAnswers"/> </h5> </b>
 
-								<h5> <b> <bean:message key="label.isCorrect"/> </b> </h5>
+							 &nbsp&nbsp
 
-						  		&nbsp&nbsp&nbsp&nbsp&nbsp
 
-								<h5> <b> <bean:message key="label.actions"/> </b> </h5>
-							</td>
-						</tr>
+							<h5> <b> <bean:message key="label.isCorrect"/>  </h5> </b>
+							
+							&nbsp&nbsp
 
+
+							<h5> <b> <bean:message key="label.actions"/> </h5> </b>
+						</td>
+					</tr>
+
 			  	 		<c:set var="optionIndex" scope="session" value="1"/>
 			  	 		<c:set var="selectedOptionFound" scope="request" value="0"/>
 						<c:forEach var="optionEntry" items="${sessionScope.mapOptionsContent}">
 							  <c:if test="${optionEntry.key == 1}"> 			
 								  <tr>
 									  	<td class="formlabel"> <c:out value="Candidate Answer ${optionIndex}"/> : </td>
 
-								  		<td class="input"> 
+								  		<td class="input" colspan=3> 
 								  			<input type="text" name="optionContent<c:out value="${optionIndex}"/>" value="<c:out value="${optionEntry.value}"/>"   
 									  		size="50" maxlength="255"> 
 									  		
-									  		&nbsp&nbsp&nbsp&nbsp&nbsp
+									  		&nbsp&nbsp
 
 									  	
 			  				  	 		<c:set var="selectedOptionFound" scope="request" value="0"/>
@@ -167,7 +169,7 @@
 											
 					 					</c:if> 			
 									  											
-									  		&nbsp&nbsp&nbsp&nbsp&nbsp
+									  		&nbsp&nbsp
 
 	  										<html:submit property="addOption" styleClass="linkbutton" 
 											onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
@@ -179,12 +181,12 @@
 					  		<c:if test="${optionEntry.key > 1}"> 			
 								<c:set var="optionIndex" scope="session" value="${optionIndex +1}"/>
 								  <tr>
-								  	<td> </td>
-								  	<td class="input"> 
+								  	<td> &nbsp </td>
+								  	<td class="input" colspan=3> 
 								  			<input type="text" name="optionContent<c:out value="${optionIndex}"/>" value="<c:out value="${optionEntry.value}"/>"   
 									  		size="50" maxlength="255"> 
 
-									  		&nbsp&nbsp&nbsp&nbsp&nbsp
+									  		&nbsp&nbsp
 
 			  				  	 		<c:set var="selectedOptionFound" scope="request" value="0"/>
 			  							<c:forEach var="selectedOptionEntry" items="${sessionScope.mapSelectedOptions}">
@@ -208,7 +210,7 @@
 
 					 					</c:if> 			
 									  	
-									  		&nbsp&nbsp&nbsp&nbsp&nbsp
+									  		&nbsp&nbsp
 
 			 								<html:submit property="removeOption" styleClass="linkbutton"  onclick="javascript:document.forms[0].deletableOptionIndex.value=${optionIndex};"
 			 								onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
@@ -232,37 +234,33 @@
 					</tr>
 
 
+
 					<tr>
 	 				 	<td class="formlabel" align=right> 
 							<bean:message key="label.feedback.incorrect"/>
 						</td>
-						<td class="formcontrol">
+						<td class="formcontrol" colspan=3>
 							<FCK:editor id="richTextFeedbackInCorrect" basePath="/lams/fckeditor/">
 								  <c:out value="${sessionScope.richTextFeedbackInCorrect}" escapeXml="false" />						  
 							</FCK:editor>
 						</td> 
-						<td>&nbsp </td>  
-						<td> &nbsp </td>
-						
 					</tr>
 					
 					<tr>
 	 				 	<td class="formlabel" align=right> 
 							<bean:message key="label.feedback.correct"/>
 						</td>
-						<td class="formcontrol">
+						<td class="formcontrol" colspan=3>
 							<FCK:editor id="richTextFeedbackCorrect" basePath="/lams/fckeditor/">
 								  <c:out value="${sessionScope.richTextFeedbackCorrect}" escapeXml="false" />						  
 							</FCK:editor>
 						</td> 
-						<td> &nbsp</td> 
-						<td> &nbsp</td>
 					</tr>
-					
-					
+
+			
 	 				 <tr>
 	 				 <td> &nbsp</td>
-	 				 <td class="input" colspan=3 align=left>
+	 				 <td class="input" align=left colspan=3>
 							<html:submit property="doneOptions" styleClass="linkbutton" 
 							onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
 								<bean:message key="button.done"/>