Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
===================================================================
diff -u -rd8a8cb5c4f4b35beed27a2a54a34ba6113f4f551 -rec045225325cf41e01a4fb7d4940528659fe1b98
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision d8a8cb5c4f4b35beed27a2a54a34ba6113f4f551)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision ec045225325cf41e01a4fb7d4940528659fe1b98)
@@ -250,7 +250,10 @@
 		mcAuthoringForm.setEditOptions(null);
 		mcAuthoringForm.setMoveUp(null);
 		mcAuthoringForm.setMoveDown(null);
+		mcAuthoringForm.setAddOption(null);
+		mcAuthoringForm.setRemoveOption(null);
 		
+		
 		String addQuestion=request.getParameter("addQuestion");
 		logger.debug("parameter addQuestion" + addQuestion);
 		if ((addQuestion != null) && addQuestion.equals("1"))
@@ -292,7 +295,22 @@
 			mcAuthoringForm.setMoveUp("1");
 		}
 		
+		String addOption=request.getParameter("addOption");
+		logger.debug("parameter addOption" + addOption);
+		if ((addOption != null) && addOption.equals("1"))
+		{
+			logger.debug("parameter addOption is selected " + addOption);
+			mcAuthoringForm.setAddOption("1");
+		}
 		
+		String removeOption=request.getParameter("removeOption");
+		logger.debug("parameter removeOption" + removeOption);
+		if ((removeOption != null) && removeOption.equals("1"))
+		{
+			logger.debug("parameter removeOption is selected " + removeOption);
+			mcAuthoringForm.setRemoveOption("1");
+		}
+		
 
 		String userAction=null;
 	 	if (mcAuthoringForm.getAddQuestion() != null)
Index: lams_tool_lamc/web/BasicContent.jsp
===================================================================
diff -u -rd8a8cb5c4f4b35beed27a2a54a34ba6113f4f551 -rec045225325cf41e01a4fb7d4940528659fe1b98
--- lams_tool_lamc/web/BasicContent.jsp	(.../BasicContent.jsp)	(revision d8a8cb5c4f4b35beed27a2a54a34ba6113f4f551)
+++ lams_tool_lamc/web/BasicContent.jsp	(.../BasicContent.jsp)	(revision ec045225325cf41e01a4fb7d4940528659fe1b98)
@@ -33,8 +33,8 @@
 				
 					<tr> <td colspan=2 align=center valign=top>
 					
-					<table align=center>
 
+
 				<!--
 					<tr>
 						<td class="formlabel" valign=top>
@@ -50,6 +50,8 @@
 						</td>
 					</tr>
 				-->
+				
+					<table align="center" border="1" cellspacing="2" cellpadding="2" summary="layout and Content">
 			  	 		<c:set var="queIndex" scope="session" value="1"/>
 						<c:forEach var="questionEntry" items="${sessionScope.mapQuestionsContent}">
 						
@@ -117,6 +119,8 @@
 										  </tr>
 									</c:if> 
 						</c:forEach>
+						
+					</table> </td> </tr>
 							<html:hidden property="questionIndex"/>
 							<html:hidden property="addQuestion"/>
 							<html:hidden property="editOptions"/>
@@ -134,7 +138,8 @@
 						<td class="input" valign=top> 
 							  <html:text property="passmark"  size="3" maxlength="3"/>							
 						</td>
-						<td valign=top> </td> <td valign=top> </td>
+						<td valign=top> </td> 
+						<td valign=top> </td>
 					</tr>
 					
 					<tr>
@@ -150,16 +155,15 @@
 					</tr>
 
 	 				 <tr>
-	 				 	<td colspan=5 align=left valign=top>								
+ 						<td valign=top> </td> 
+						<td class="input" colspan=3 align=left valign=top>								
 							<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>
-							
-
+						<td valign=top> </td> 
+						<td valign=top> </td>
+					</tr>
+	 				 
 	 				</table>