Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties
===================================================================
diff -u -r7d4312121d0ac51529464536ca8203c445f5d433 -r66e72872d1d3cdb236fce53f721ede405249ab50
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties	(.../McResources.properties)	(revision 7d4312121d0ac51529464536ca8203c445f5d433)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties	(.../McResources.properties)	(revision 66e72872d1d3cdb236fce53f721ede405249ab50)
@@ -11,6 +11,8 @@
 label.action							=Action
 label.actions							=Actions
 label.add.question						=Add Question
+label.add.option						=Add Option
+label.mc.options						=Candidate Answers
 label.fileContent						=File Content
 
 button.basic							=Basic
@@ -88,6 +90,7 @@
 error.reportTitle						=Please correct this: The field "Report Title (Advanced)" is mandatory. <br>
 error.defaultquestion.empty				=Please correct this: The first question can not be empty. <br>
 error.passMark.empty					=Please correct this: Pass Mark can not be empty.
+options.count.zero						=Please correct this: There must be at least one candidate answer.
 error.passmark.notInteger				=Please correct this: Pass Mark can only be an integer.
 error.weights.total.invalid				=Please correct this: The total weight must equal 100.
 error.file.notPersisted					=An error occurred: The file is not viewable yet. Please save all the content first and check back.
@@ -105,6 +108,7 @@
 error.defaultQuestionContent.notAvailable	=Tool Activity Error! Can't continue <br> The the default question content for the Tool Activity has not been set up.
 error.defaultOptionsContent.notAvailable	=Tool Activity Error! Can't continue <br> The the default options content for the Tool Activity has not been set up.
 
+
 #Learning mode resources
 label.learning.qa						=Answers for Q/A
 label.question							=Question
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
===================================================================
diff -u -r7d4312121d0ac51529464536ca8203c445f5d433 -r66e72872d1d3cdb236fce53f721ede405249ab50
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision 7d4312121d0ac51529464536ca8203c445f5d433)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision 66e72872d1d3cdb236fce53f721ede405249ab50)
@@ -396,10 +396,10 @@
     	mcAuthoringForm.setEditOptions(null);
     	mcAuthoringForm.setMoveUp(null);
     	mcAuthoringForm.setMoveDown(null);
-    	mcAuthoringForm.setAddOption(null);
     	mcAuthoringForm.setRemoveOption(null);
     	mcAuthoringForm.setViewFileItem(null);
     	
+    	//mcAuthoringForm.setAddOption(null);
     	
     	/*
     	String addQuestion=request.getParameter("addQuestion");
@@ -444,13 +444,15 @@
     		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);
@@ -515,7 +517,6 @@
     	logger.debug("weightsValid:" + weightsValid);
     	if (weightsValid == false)
     	{
-    		request.getSession().setAttribute(CURRENT_TAB, new Long(1));
     		mcAuthoringForm.resetUserAction();
     		
     		int maxQuestionIndex=mapQuestionsContent.size();
@@ -540,7 +541,6 @@
     		mcAuthoringForm.resetUserAction();
     		persistError(request,"error.question.weight.total");
     		
-    		request.getSession().setAttribute(CURRENT_TAB, new Long(1));
     		
     		int maxQuestionIndex=mapQuestionsContent.size();
     		request.getSession().setAttribute(MAX_QUESTION_INDEX, new Integer(maxQuestionIndex));
@@ -562,7 +562,6 @@
     	request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
     	logger.debug("resetting  EDIT_OPTIONS_MODE to 0");
         mcAuthoringForm.resetUserAction();
-        request.getSession().setAttribute(CURRENT_TAB, new Long(1));
         
         int maxQuestionIndex=mapQuestionsContent.size();
     	request.getSession().setAttribute(MAX_QUESTION_INDEX, new Integer(maxQuestionIndex));
@@ -620,7 +619,6 @@
 	 	request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
 		logger.debug("resetting  EDIT_OPTIONS_MODE to 0");
 		mcAuthoringForm.resetUserAction();
-		request.getSession().setAttribute(CURRENT_TAB, new Long(1));
 		
 		int maxQuestionIndex=mapQuestionsContent.size();
 		request.getSession().setAttribute(MAX_QUESTION_INDEX, new Integer(maxQuestionIndex));
@@ -679,7 +677,6 @@
     		
     		request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
     		logger.debug("setting  EDIT_OPTIONS_MODE to 0");
-    		request.getSession().setAttribute(CURRENT_TAB, new Long(1));
     		return (mapping.findForward(LOAD_QUESTIONS));
     	}
     	
@@ -921,7 +918,6 @@
      	request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(1));
     	logger.debug("resetting  EDIT_OPTIONS_MODE to 1");
     	mcAuthoringForm.resetUserAction();
-    	request.getSession().setAttribute(CURRENT_TAB, new Long(1));
     	return (mapping.findForward(LOAD_QUESTIONS));
     }
 
@@ -961,7 +957,6 @@
 			
 			request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(1));
 			logger.debug("setting  EDIT_OPTIONS_MODE to 1");
-			request.getSession().setAttribute(CURRENT_TAB, new Long(1));
 			return (mapping.findForward(LOAD_QUESTIONS));	
  		}
 	 	
@@ -1018,7 +1013,6 @@
  		request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(1));
 		logger.debug("resetting  EDIT_OPTIONS_MODE to 1");
  		mcAuthoringForm.resetUserAction();
-		request.getSession().setAttribute(CURRENT_TAB, new Long(1));
 		return (mapping.findForward(LOAD_QUESTIONS));
     }
     
@@ -1047,7 +1041,22 @@
 		Map mapOptionsContent=repopulateMap(request, "optionContent");
 	 	logger.debug("mapOptionsContent after shrinking: " + mapOptionsContent);
 	 	logger.debug("mapOptionsContent size after shrinking: " + mapOptionsContent.size());
+	 	int mapSize=mapOptionsContent.size();
+	 	if ((mapSize == 1) && (optionIndex.equals("1")))
+		{
+	 		ActionMessages errors= new ActionMessages();
+    		errors= new ActionMessages();
+			errors.add(Globals.ERROR_KEY,new ActionMessage("options.count.zero"));
+			saveErrors(request,errors);
+			mcAuthoringForm.resetUserAction();
+			persistError(request,"options.count.zero");
+			
+			request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(1));
+	 		logger.debug("setting EDIT_OPTIONS_MODE :" + 1);
+			return (mapping.findForward(LOAD_QUESTIONS));
+		}
 	 	
+	 	
 		String deletableOptionEntry=(String)mapOptionsContent.get(optionIndex);
 		logger.debug("deletableOptionEntry:" + deletableOptionEntry);
 
@@ -1108,7 +1117,6 @@
  	 	request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(1));
 		logger.debug("resetting  EDIT_OPTIONS_MODE to 1");
 		mcAuthoringForm.resetUserAction();			
-		request.getSession().setAttribute(CURRENT_TAB, new Long(1));
 		return (mapping.findForward(LOAD_QUESTIONS));
     }
     
@@ -1131,7 +1139,7 @@
     	Map mapQuestionsContent=repopulateMap(request, "questionContent");
      	logger.debug("mapQuestionsContent before move down: " + mapQuestionsContent);
      	
-    		String questionIndex =mcAuthoringForm.getQuestionIndex();
+    	String questionIndex =mcAuthoringForm.getQuestionIndex();
     	logger.debug("questionIndex:" + questionIndex);
     	String movableQuestionEntry=(String)mapQuestionsContent.get(questionIndex);
     	logger.debug("movableQuestionEntry:" + movableQuestionEntry);
@@ -1145,7 +1153,6 @@
 		mcAuthoringForm.resetUserAction();
 		request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
     	logger.debug("resetting  EDIT_OPTIONS_MODE to 0");
-        request.getSession().setAttribute(CURRENT_TAB, new Long(1));
         
         int maxQuestionIndex=mapQuestionsContent.size();
     	request.getSession().setAttribute(MAX_QUESTION_INDEX, new Integer(maxQuestionIndex));
@@ -1186,7 +1193,6 @@
  		mcAuthoringForm.resetUserAction();
  		request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
 		logger.debug("resetting  EDIT_OPTIONS_MODE to 0");
-	    request.getSession().setAttribute(CURRENT_TAB, new Long(1));
 	    
 	    int maxQuestionIndex=mapQuestionsContent.size();
 		request.getSession().setAttribute(MAX_QUESTION_INDEX, new Integer(maxQuestionIndex));
@@ -1226,7 +1232,6 @@
 			
 			request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(1));
 			logger.debug("setting  EDIT_OPTIONS_MODE to 1");
-			request.getSession().setAttribute(CURRENT_TAB, new Long(1));
 			return (mapping.findForward(LOAD_QUESTIONS));	
  		}
 		
@@ -1294,7 +1299,6 @@
     	request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
 		logger.debug("setting  EDIT_OPTIONS_MODE to 0");
 		mcAuthoringForm.resetUserAction();
-		request.getSession().setAttribute(CURRENT_TAB, new Long(1));
 		return (mapping.findForward(LOAD_QUESTIONS));
     }
 
@@ -1331,8 +1335,6 @@
 	 	
 		if (mapSize == 0)
 		{
-			request.getSession().setAttribute(CURRENT_TAB, new Long(1));
-			
 			errors= new ActionMessages();
 			errors.add(Globals.ERROR_KEY,new ActionMessage("error.questions.submitted.none"));
 			saveErrors(request,errors);
@@ -1348,7 +1350,6 @@
 		logger.debug("weightsValid:" + weightsValid);
 		if (weightsValid == false)
 		{
-			request.getSession().setAttribute(CURRENT_TAB, new Long(1));
 			mcAuthoringForm.resetUserAction();
 			
 			int maxQuestionIndex=mapQuestionsContent.size();
@@ -1372,8 +1373,7 @@
 			
 			request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
 			logger.debug("setting  EDIT_OPTIONS_MODE to 0");
-			request.getSession().setAttribute(CURRENT_TAB, new Long(1));
-			
+
 			int maxQuestionIndex=mapQuestionsContent.size();
 			request.getSession().setAttribute(MAX_QUESTION_INDEX, new Integer(maxQuestionIndex));
 			logger.debug("MAX_QUESTION_INDEX: " +  request.getSession().getAttribute(MAX_QUESTION_INDEX));
@@ -1434,8 +1434,7 @@
 				
 				request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
 				logger.debug("setting  EDIT_OPTIONS_MODE to 0");
-				request.getSession().setAttribute(CURRENT_TAB, new Long(1));
-				
+
 				int maxQuestionIndex=mapQuestionsContent.size();
 				request.getSession().setAttribute(MAX_QUESTION_INDEX, new Integer(maxQuestionIndex));
 				logger.debug("MAX_QUESTION_INDEX: " +  request.getSession().getAttribute(MAX_QUESTION_INDEX));
@@ -1463,8 +1462,7 @@
 			
 			request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
 			logger.debug("setting  EDIT_OPTIONS_MODE to 0");
-			request.getSession().setAttribute(CURRENT_TAB, new Long(1));
-			
+
 			int maxQuestionIndex=mapQuestionsContent.size();
 			request.getSession().setAttribute(MAX_QUESTION_INDEX, new Integer(maxQuestionIndex));
 			logger.debug("MAX_QUESTION_INDEX: " +  request.getSession().getAttribute(MAX_QUESTION_INDEX));
@@ -1518,7 +1516,7 @@
 			logger.debug("either title or instructions or both is missing. Returning back to from to fix errors:");
 			request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
 			logger.debug("setting  EDIT_OPTIONS_MODE to 0");
-			request.getSession().setAttribute(CURRENT_TAB, new Long(1));
+
 			mcAuthoringForm.resetUserAction();
 			
 			int maxQuestionIndex=mapQuestionsContent.size();
@@ -1614,7 +1612,6 @@
 		logger.debug("setting  EDIT_OPTIONS_MODE to 0");
 	
 		mcAuthoringForm.resetUserAction();
-		request.getSession().setAttribute(CURRENT_TAB, new Long(1));
 		
 		int maxQuestionIndex=mapQuestionsContent.size();
 		request.getSession().setAttribute(MAX_QUESTION_INDEX, new Integer(maxQuestionIndex));
@@ -1659,8 +1656,7 @@
 			
 			request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(2));
 	 		logger.debug("setting EDIT_OPTIONS_MODE :" + 2);
-			request.getSession().setAttribute(CURRENT_TAB, new Long(3));
-	   	    return (mapping.findForward(ALL_INSTRUCTIONS));
+			return (mapping.findForward(ALL_INSTRUCTIONS));
  		}
  		
  		InputStream fileInputStream=mcService.downloadFile(new Long(uuid), null);
@@ -1698,7 +1694,6 @@
  		mcAuthoringForm.resetUserAction();
  		request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(2));
  		logger.debug("setting EDIT_OPTIONS_MODE :" + 2);
-		request.getSession().setAttribute(CURRENT_TAB, new Long(3));
    	    return (mapping.findForward(ALL_INSTRUCTIONS));
     }
     
@@ -1718,7 +1713,6 @@
     	logger.debug("userAction:" + userAction);
     	
     	mcAuthoringForm.resetUserAction();
-    	request.getSession().setAttribute(CURRENT_TAB, new Long(1));
         return (mapping.findForward(LOAD_QUESTIONS));
     }
     
@@ -1737,7 +1731,6 @@
 		request.setAttribute(USER_ACTION, userAction);
 		logger.debug("userAction:" + userAction);
 		mcAuthoringForm.resetUserAction();
-		request.getSession().setAttribute(CURRENT_TAB, new Long(1));
 	    return (mapping.findForward(LOAD_QUESTIONS));
     }
 
@@ -1762,7 +1755,6 @@
  		mcAuthoringForm.resetUserAction();
  		request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(2));
  		logger.debug("setting EDIT_OPTIONS_MODE :" + 2 );
-		request.getSession().setAttribute(CURRENT_TAB, new Long(3));
    	    return (mapping.findForward(ALL_INSTRUCTIONS));    
     }
     
@@ -1786,7 +1778,6 @@
         mcAuthoringForm.resetUserAction();
  		request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(2));
  		logger.debug("setting EDIT_OPTIONS_MODE :" + 2);
-		request.getSession().setAttribute(CURRENT_TAB, new Long(3));
    	    return (mapping.findForward(ALL_INSTRUCTIONS));
     }
     
Index: lams_tool_lamc/web/OptionsContent.jsp
===================================================================
diff -u -rf37e902802cd59114b62435f47e9106df830496d -r66e72872d1d3cdb236fce53f721ede405249ab50
--- lams_tool_lamc/web/OptionsContent.jsp	(.../OptionsContent.jsp)	(revision f37e902802cd59114b62435f47e9106df830496d)
+++ lams_tool_lamc/web/OptionsContent.jsp	(.../OptionsContent.jsp)	(revision 66e72872d1d3cdb236fce53f721ede405249ab50)
@@ -46,8 +46,21 @@
 					<tr> <td colspan=4 align=center valign=top width="100%">
 					
 					<table align="center" border="1">
+					     <tr>
+							  	<td bgcolor="#EEEEEE" colspan=4 class="input" valign=top align=left>
+								  	 <font size=2> <b> <bean:message key="label.mc.options"/> </b> </font>
+							  	</td>
+						 </tr>					
+					     <tr>
+							  	<td bgcolor="#EEEEEE" colspan=4 class="input" valign=top align=right>
+									<html:submit property="addOption" styleClass="linkbutton" 
+									onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
+										<bean:message key="label.add.option"/>
+									</html:submit>	 				 		  										  		
+						  	</td>
+						 </tr>							
 					
-			  	 		<c:set var="optionIndex" scope="session" value="1"/>
+						<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}"> 			
@@ -81,7 +94,7 @@
 										</td>
 	
 										<td bgcolor="#EEEEEE" class="input" valign=top>
-	       								    <img src="images/add.gif" align=left onclick="javascript:document.forms[0].addOption.value=1; document.forms[0].submit();">
+	       								    <img src="images/delete.gif" align=left onclick="javascript:document.forms[0].removeOption.value=1; document.forms[0].deletableOptionIndex.value=1; document.forms[0].submit();">
 									  	</td>
 							 </tr>
 							</c:if> 			
@@ -126,7 +139,6 @@
 					</table> </td> </tr>	
 					
 					<html:hidden property="deletableOptionIndex"/>							
-					<html:hidden property="addOption"/>
 					<html:hidden property="removeOption"/>
 					
 					<tr>