Index: lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -rc56857991e269aa7f5bd250a05b52c767a9957ad -ra3e987093464232bfb4536f3335acc9851291b95
--- lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision c56857991e269aa7f5bd250a05b52c767a9957ad)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision a3e987093464232bfb4536f3335acc9851291b95)
@@ -55,6 +55,12 @@
 label.authoring.basic.resource.description.input  =Description
 label.authoring.basic.resource.zip.file.input  =Zip file:
 label.authoring.basic.none  =None
+label.authoring.choice.add.choice  =Add Choice
+label.authoring.choice.field.required  =This field is required.
+label.authoring.choice.enter.integer  =Please enter an integer.
+label.authoring.choice.enter.float  =Please enter a float.
+label.authoring.choice.answer.options  =You should provide at least 2 answer options.
+
 label.authoring.online.file  =Upload online file
 label.authoring.offline.file  =Upload offline file
 label.authoring.choosefile.button  =Choose file
Index: lams_tool_assessment/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -rc56857991e269aa7f5bd250a05b52c767a9957ad -ra3e987093464232bfb4536f3335acc9851291b95
--- lams_tool_assessment/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision c56857991e269aa7f5bd250a05b52c767a9957ad)
+++ lams_tool_assessment/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision a3e987093464232bfb4536f3335acc9851291b95)
@@ -84,7 +84,6 @@
 			<forward name="choice" path="/pages/authoring/parts/addchoice.jsp" />
 			<forward name="multiplechoice" path="/pages/authoring/parts/addmultiplechoice.jsp" />
 			<forward name="matchingpairs" path="/pages/authoring/parts/addmatchingpairs.jsp" />
-			<forward name="fillthegap" path="/pages/authoring/parts/addfillthegap.jsp" />
 			<forward name="shortanswer" path="/pages/authoring/parts/addshortanswer.jsp" />
 			<forward name="numerical" path="/pages/authoring/parts/addnumerical.jsp" />
 			<forward name="truefalse" path="/pages/authoring/parts/addtruefalse.jsp" />
@@ -99,7 +98,6 @@
 			<forward name="choice" path="/pages/authoring/parts/addchoice.jsp" />
 			<forward name="multiplechoice" path="/pages/authoring/parts/addmultiplechoice.jsp" />
 			<forward name="matchingpairs" path="/pages/authoring/parts/addmatchingpairs.jsp" />
-			<forward name="fillthegap" path="/pages/authoring/parts/addfillthegap.jsp" />
 			<forward name="shortanswer" path="/pages/authoring/parts/addshortanswer.jsp" />
 			<forward name="numerical" path="/pages/authoring/parts/addnumerical.jsp" />
 			<forward name="truefalse" path="/pages/authoring/parts/addtruefalse.jsp" />
@@ -114,7 +112,6 @@
 			<forward name="choice" path="/pages/authoring/parts/addchoice.jsp" />
 			<forward name="multiplechoice" path="/pages/authoring/parts/addmultiplechoice.jsp" />
 			<forward name="matchingpairs" path="/pages/authoring/parts/addmatchingpairs.jsp" />
-			<forward name="fillthegap" path="/pages/authoring/parts/addfillthegap.jsp" />
 			<forward name="shortanswer" path="/pages/authoring/parts/addshortanswer.jsp" />
 			<forward name="numerical" path="/pages/authoring/parts/addnumerical.jsp" />
 			<forward name="truefalse" path="/pages/authoring/parts/addtruefalse.jsp" />
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
===================================================================
diff -u -rc56857991e269aa7f5bd250a05b52c767a9957ad -ra3e987093464232bfb4536f3335acc9851291b95
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	(.../AssessmentConstants.java)	(revision c56857991e269aa7f5bd250a05b52c767a9957ad)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	(.../AssessmentConstants.java)	(revision a3e987093464232bfb4536f3335acc9851291b95)
@@ -42,16 +42,14 @@
     public static final short QUESTION_TYPE_MULTIPLE_CHOICE = 2;
 
     public static final short QUESTION_TYPE_MATCHING_PAIRS = 3;
-
-    public static final short QUESTION_TYPE_FILL_THE_GAP = 4;
     
-    public static final short QUESTION_TYPE_SHORT_ANSWER = 5;
+    public static final short QUESTION_TYPE_SHORT_ANSWER = 4;
 
-    public static final short QUESTION_TYPE_NUMERICAL = 6;
+    public static final short QUESTION_TYPE_NUMERICAL = 5;
 
-    public static final short QUESTION_TYPE_TRUE_FALSE = 7;
+    public static final short QUESTION_TYPE_TRUE_FALSE = 6;
 
-    public static final short QUESTION_TYPE_ESSAY = 8;
+    public static final short QUESTION_TYPE_ESSAY = 7;
 
     // for action forward name
     public static final String SUCCESS = "success";
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
===================================================================
diff -u -rc56857991e269aa7f5bd250a05b52c767a9957ad -ra3e987093464232bfb4536f3335acc9851291b95
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision c56857991e269aa7f5bd250a05b52c767a9957ad)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision a3e987093464232bfb4536f3335acc9851291b95)
@@ -683,13 +683,13 @@
 	Set<AssessmentAnswerOption> optionList = getOptionsFromRequest(request, true);
 	
 	AssessmentQuestionForm questionForm = (AssessmentQuestionForm) form;
-	ActionErrors errors = validateAssessmentQuestion(questionForm, optionList);
+	ActionErrors errors = new ActionErrors();//validateAssessmentQuestion(questionForm, optionList);
 
-	if (!errors.isEmpty()) {
-	    this.addErrors(request, errors);
-	    request.setAttribute(AssessmentConstants.ATTR_OPTION_LIST, optionList);	    
-	    return findForward(questionForm.getQuestionType(), mapping);
-	}
+//	if (!errors.isEmpty()) {
+//	    this.addErrors(request, errors);
+//	    request.setAttribute(AssessmentConstants.ATTR_OPTION_LIST, optionList);	    
+//	    return findForward(questionForm.getQuestionType(), mapping);
+//	}
 	
 	try {
 	    extractFormToAssessmentQuestion(request, questionForm, optionList);
@@ -1070,9 +1070,6 @@
 	case AssessmentConstants.QUESTION_TYPE_MATCHING_PAIRS:
 	    forward = mapping.findForward("matchingpairs");
 	    break;
-	case AssessmentConstants.QUESTION_TYPE_FILL_THE_GAP:
-	    forward = mapping.findForward("fillthegap");
-	    break;
 	case AssessmentConstants.QUESTION_TYPE_SHORT_ANSWER:
 	    forward = mapping.findForward("shortanswer");
 	    break;
@@ -1188,42 +1185,42 @@
 
     }
 
-    /**
-     * Vaidate assessment question regards to their type (url/file/learning object/website zip file)
-     * 
-     * @param questionForm
-     * @return
-     */
-    private ActionErrors validateAssessmentQuestion(AssessmentQuestionForm questionForm, Set<AssessmentAnswerOption> optionList) {
-	ActionErrors errors = new ActionErrors();
-	if (StringUtils.isBlank(questionForm.getTitle())) {
-	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(AssessmentConstants.ERROR_MSG_QUESTION_NAME_BLANK));
-	}
-	if (StringUtils.isBlank(questionForm.getQuestion())) {
-	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(AssessmentConstants.ERROR_MSG_QUESTION_TEXT_BLANK));
-	}
-	
-	if (questionForm.getQuestionType() == AssessmentConstants.QUESTION_TYPE_CHOICE) {
-	    /* Checks if entered value is integer. */
-	    try {
-		Integer.parseInt(questionForm.getDefaultGrade());
-	    } catch (NumberFormatException nfe) {
-		errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
-			AssessmentConstants.ERROR_MSG_DEFAULT_GRADE_WRONG_FORMAT));
-	    }
-	    try {
-		Float.parseFloat(questionForm.getPenaltyFactor());
-	    } catch (NumberFormatException nfe) {
-		errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
-			AssessmentConstants.ERROR_MSG_PENALTY_FACTOR_WRONG_FORMAT));
-	    }
-	    
-	    if (optionList.size() < 2) {
-		errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(AssessmentConstants.ERROR_MSG_NOT_ENOUGH_OPTIONS));
-	    }
-	}
-	return errors;
-    }
+//    /**
+//     * Vaidate assessment question regards to their type (url/file/learning object/website zip file)
+//     * 
+//     * @param questionForm
+//     * @return
+//     */
+//    private ActionErrors validateAssessmentQuestion(AssessmentQuestionForm questionForm, Set<AssessmentAnswerOption> optionList) {
+//	ActionErrors errors = new ActionErrors();
+//	if (StringUtils.isBlank(questionForm.getTitle())) {
+//	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(AssessmentConstants.ERROR_MSG_QUESTION_NAME_BLANK));
+//	}
+////	if (StringUtils.isBlank(questionForm.getQuestion())) {
+////	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(AssessmentConstants.ERROR_MSG_QUESTION_TEXT_BLANK));
+////	}
+//	
+//	if (questionForm.getQuestionType() == AssessmentConstants.QUESTION_TYPE_CHOICE) {
+//	    /* Checks if entered value is integer. */
+//	    try {
+//		Integer.parseInt(questionForm.getDefaultGrade());
+//	    } catch (NumberFormatException nfe) {
+//		errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
+//			AssessmentConstants.ERROR_MSG_DEFAULT_GRADE_WRONG_FORMAT));
+//	    }
+//	    try {
+//		Float.parseFloat(questionForm.getPenaltyFactor());
+//	    } catch (NumberFormatException nfe) {
+//		errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
+//			AssessmentConstants.ERROR_MSG_PENALTY_FACTOR_WRONG_FORMAT));
+//	    }
+//	    
+//	    if (optionList.size() < 2) {
+//		errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(AssessmentConstants.ERROR_MSG_NOT_ENOUGH_OPTIONS));
+//	    }
+//	}
+//	return errors;
+//    }
 
     /**
      * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode.
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
===================================================================
diff -u -rc56857991e269aa7f5bd250a05b52c767a9957ad -ra3e987093464232bfb4536f3335acc9851291b95
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	(.../LearningAction.java)	(revision c56857991e269aa7f5bd250a05b52c767a9957ad)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	(.../LearningAction.java)	(revision a3e987093464232bfb4536f3335acc9851291b95)
@@ -595,9 +595,6 @@
 	case AssessmentConstants.QUESTION_TYPE_MATCHING_PAIRS:
 	    forward = mapping.findForward("website");
 	    break;
-	case AssessmentConstants.QUESTION_TYPE_FILL_THE_GAP:
-	    forward = mapping.findForward("learningobject");
-	    break;
 	default:
 	    forward = null;
 	    break;
@@ -656,10 +653,10 @@
 	// if(StringUtils.isBlank(questionForm.getDescription()))
 	// errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage(AssessmentConstants.ERROR_MSG_DESC_BLANK));
 	// }
-	if (questionForm.getQuestionType() == AssessmentConstants.QUESTION_TYPE_MATCHING_PAIRS
-		|| questionForm.getQuestionType() == AssessmentConstants.QUESTION_TYPE_FILL_THE_GAP
-		|| questionForm.getQuestionType() == AssessmentConstants.QUESTION_TYPE_MULTIPLE_CHOICE) {
-
+//	if (questionForm.getQuestionType() == AssessmentConstants.QUESTION_TYPE_MATCHING_PAIRS
+//		|| questionForm.getQuestionType() == AssessmentConstants.QUESTION_TYPE_FILL_THE_GAP
+//		|| questionForm.getQuestionType() == AssessmentConstants.QUESTION_TYPE_MULTIPLE_CHOICE) {
+//
 //	    if (questionForm.getFile() != null && FileUtil.isExecutableFile(questionForm.getFile().getFileName())) {
 //		ActionMessage msg = new ActionMessage("error.attachment.executable");
 //		errors.add(ActionMessages.GLOBAL_MESSAGE, msg);
@@ -673,7 +670,7 @@
 //		    && (questionForm.getFile() == null || StringUtils.isEmpty(questionForm.getFile().getFileName()))) {
 //		errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(AssessmentConstants.ERROR_MSG_FILE_BLANK));
 //	    }
-	}
+//	}
 	return errors;
     }
 
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/servlet/ExportServlet.java
===================================================================
diff -u -rc56857991e269aa7f5bd250a05b52c767a9957ad -ra3e987093464232bfb4536f3335acc9851291b95
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/servlet/ExportServlet.java	(.../ExportServlet.java)	(revision c56857991e269aa7f5bd250a05b52c767a9957ad)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/servlet/ExportServlet.java	(.../ExportServlet.java)	(revision a3e987093464232bfb4536f3335acc9851291b95)
@@ -230,9 +230,9 @@
 	handler = getToolContentHandler();
 	for (Summary summary : list) {
 	    // for learning object, it just display "No offlice pakcage avaliable" information.
-	    if (summary.getQuestionType() == AssessmentConstants.QUESTION_TYPE_FILL_THE_GAP
-		    || summary.getQuestionType() == AssessmentConstants.QUESTION_TYPE_CHOICE)
-		continue;
+//	    if (summary.getQuestionType() == AssessmentConstants.QUESTION_TYPE_FILL_THE_GAP
+//		    || summary.getQuestionType() == AssessmentConstants.QUESTION_TYPE_CHOICE)
+//		continue;
 	    try {
 		int idx = 1;
 		String userName = summary.getUsername();
Index: lams_tool_assessment/web/includes/images/req.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_assessment/web/pages/authoring/basic.jsp
===================================================================
diff -u -rc56857991e269aa7f5bd250a05b52c767a9957ad -ra3e987093464232bfb4536f3335acc9851291b95
--- lams_tool_assessment/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision c56857991e269aa7f5bd250a05b52c767a9957ad)
+++ lams_tool_assessment/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision a3e987093464232bfb4536f3335acc9851291b95)
@@ -3,7 +3,7 @@
 <c:url var="newQuestionInitUrl" value='/authoring/newQuestionInit.do'>
 	<c:param name="sessionMapID" value="${formBean.sessionMapID}" />
 </c:url>	
-	
+
 <script lang="javascript">
 	//The panel of assessment list panel
 	var questionListTargetDiv = "#questionListArea";
@@ -105,7 +105,6 @@
 		<option selected="selected"><fmt:message key="label.authoring.basic.type.choice" /></option>
 		<option><fmt:message key="label.authoring.basic.type.multiple.choice" /></option>
 		<option><fmt:message key="label.authoring.basic.type.matching.pairs" /></option>
-		<option><fmt:message key="label.authoring.basic.type.fill.the.gap" /></option>
 		<option><fmt:message key="label.authoring.basic.type.short.answer" /></option>
 		<option><fmt:message key="label.authoring.basic.type.numerical" /></option>
 		<option><fmt:message key="label.authoring.basic.type.true.false" /></option>
Index: lams_tool_assessment/web/pages/authoring/parts/addchoice.jsp
===================================================================
diff -u -rc56857991e269aa7f5bd250a05b52c767a9957ad -ra3e987093464232bfb4536f3335acc9851291b95
--- lams_tool_assessment/web/pages/authoring/parts/addchoice.jsp	(.../addchoice.jsp)	(revision c56857991e269aa7f5bd250a05b52c767a9957ad)
+++ lams_tool_assessment/web/pages/authoring/parts/addchoice.jsp	(.../addchoice.jsp)	(revision a3e987093464232bfb4536f3335acc9851291b95)
@@ -5,13 +5,67 @@
 <lams:html>
 	<lams:head>
 		<%@ include file="/common/header.jsp"%>
+		<c:set var="ctxPath" value="${pageContext.request.contextPath}"	scope="request" />
+		
+		<style type="text/css">
+			label { width: 10em; float: left; }
+			label.error { float: none; color: red; padding-left: .5em; vertical-align: top; font-weight: bold; font-style: italic;}
+			em { font-weight: bold; padding-right: 1em; vertical-align: top; }
+		</style>
 
 		<script type="text/javascript">
 			var addOptionUrl = "<c:url value='/authoring/newOption.do'/>";
 		   	var removeOptionUrl = "<c:url value='/authoring/removeOption.do'/>";
     	    var upOptionUrl = "<c:url value='/authoring/upOption.do'/>";
     	    var downOptionUrl = "<c:url value='/authoring/downOption.do'/>";
-
+		</script>
+		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/assessmentquestion.js'/>"></script>
+		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/jquery-1.2.6.pack.js'/>"></script>
+		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/jquery.validate.js'/>"></script>
+		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/jquery.form.js'/>"></script>
+  	    <script><!--
+			$(document).ready(function(){
+		    	$("#assessmentQuestionForm").validate({
+		    		rules: {
+		    			title: "required",
+		    			defaultGrade: {
+		    			      required: true,
+		    			      digits: true
+		    			},
+		    			penaltyFactor: {
+		    			      required: true,
+		    			      number: true
+		    			},
+		    			fake: {
+		    				required: function(element) {
+		    		        	return $("input[name^=optionAnswer]:filled").length < 2;
+			    		    }
+	    			    }
+		    		},
+		    		messages: {
+		    			title: "<fmt:message key='label.authoring.choice.field.required'/>",
+		    			defaultGrade: {
+		    				required: "<fmt:message key='label.authoring.choice.field.required'/>",
+		    				digits: "<fmt:message key='label.authoring.choice.enter.integer'/>"
+		    			},
+		    			penaltyFactor: {
+		    				required: "<fmt:message key='label.authoring.choice.field.required'/>",
+		    				number: "<fmt:message key='label.authoring.choice.enter.float'/>"
+		    			}
+		    		},
+		    		debug: true,
+     			    submitHandler: function(form) {
+		    			$("#optionList").val($("#optionForm").serialize(true));
+		    			//$("#assessmentQuestionForm").submit();
+		    	    	var options = { 
+		    	    		target:  parent.jQuery('#questionListArea'), 
+		    		   		success: afterRatingSubmit  // post-submit callback
+		    		    }; 				
+		    		    				
+		    			$('#assessmentQuestionForm').ajaxSubmit(options);
+		    		}
+		  		});
+			});
     		function submitAssessmentQuestion(){
     			$("#optionList").val($("#optionForm").serialize(true));
     			//$("#assessmentQuestionForm").submit();
@@ -27,23 +81,8 @@
     		function afterRatingSubmit(responseText, statusText)  { 
     			self.parent.refreshThickbox()
     			self.parent.tb_remove();
-    		}    	    
-		</script>
-		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/assessmentquestion.js'/>"></script>
-		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/jquery-1.2.6.pack.js'/>"></script>
-		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/jquery.validate.js'/>"></script>
-		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/jquery.form.js'/>"></script>
-		<style type="text/css">
-			label { width: 10em; float: left; }
-			label.error { float: none; color: red; padding-left: .5em; vertical-align: top; }
-			.submit { margin-left: 12em; }
-			em { font-weight: bold; padding-right: 1em; vertical-align: top; }
-		</style>
-  	    <script>
-			$(document).ready(function(){
-		    	$("#assessmentQuestionForm").validate();
-		  	});
-  		</script>
+    		}    
+  		--></script>
 		
 		
 	</lams:head>
@@ -53,7 +92,7 @@
 			<%@ include file="/common/messages.jsp"%>
 			
 			<html:form action="/authoring/saveOrUpdateQuestion" method="post" styleId="assessmentQuestionForm">
-					<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 				<html:hidden property="sessionMapID" />
 				<input type="hidden" name="optionList" id="optionList" />
 				<input type="hidden" name="questionType" id="questionType" value="1" />
@@ -65,21 +104,24 @@
 	
 				<div class="field-name">
 					<fmt:message key="label.authoring.basic.question.name" />
+					<img title="Required field" alt="Required field" src="${ctxPath}/includes/images/req.gif" />
 				</div>
-				<em>*</em><input name="title" size="55" value="" type="text" class="{validate:{required:true, email:true, messages:{required:'Please enter your email address', email:'Please enter a valid email address'}}}">
+				<html:text property="title" size="55" />
 	
 				<div class="field-name space-top">
 					<fmt:message key="label.authoring.basic.question.text" />
 				</div>
-				<em>*</em><lams:STRUTS-textarea rows="5" cols="50" property="question" />					
+				<lams:STRUTS-textarea rows="5" cols="50" property="question"/>
 	
 				<div class="field-name space-top">
 					<fmt:message key="label.authoring.basic.default.question.grade" />
+					<img title="Required field" alt="Required field" src="${ctxPath}/includes/images/req.gif" />
 				</div>
-				<input class="required" name="defaultGrade" size="3" type="text">
+				<html:text property="defaultGrade" size="3" />
 					
 				<div class="field-name space-top">
 					<fmt:message key="label.authoring.basic.penalty.factor" />
+					<img title="Required field" alt="Required field" src="${ctxPath}/includes/images/req.gif" />
 				</div>
 				<html:text property="penaltyFactor" size="3" />
 				
@@ -88,25 +130,23 @@
 				</div>
 				<lams:STRUTS-textarea rows="5" cols="50" property="generalFeedback"/>
 	
-				<div class="space-top">
-					<html:checkbox property="shuffle"
-						styleId="shuffleTheChoices" styleClass="noBorder">
-					</html:checkbox>
-					<label for="shuffleTheChoices">
-						<fmt:message key="label.authoring.basic.shuffle.the.choices" />
-					</label>
+				<div class="field-name space-top">
+					<fmt:message key="label.authoring.basic.shuffle.the.choices" />
 				</div>
+				<html:checkbox property="shuffle" styleId="shuffleTheChoices" styleClass="noBorder" />
+				
+				<br><br>
+				<input type="hidden" name="fake" id="fake">
+				<label for="fake" class="error" style="display: none;"><fmt:message key='label.authoring.choice.answer.options'/></label>
 			</html:form>
 			
-			
-	
 			<!-- Options -->
 			<%@ include file="optionlist.jsp"%>
-			
+
 			<br /><br /><br />
 			<lams:ImgButtonWrapper>
-				<a href="#" onclick="submitAssessmentQuestion();" class="button-add-item">
-					<fmt:message key="label.authoring.basic.add.url" /> 
+				<a href="#" onclick="$('#assessmentQuestionForm').submit();" class="button-add-item">
+					<fmt:message key="label.authoring.choice.add.choice" /> 
 				</a>
 				<a href="#" onclick="self.parent.tb_remove();" class="button space-left">
 					<fmt:message key="label.cancel" /> 
Index: lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp
===================================================================
diff -u -rc56857991e269aa7f5bd250a05b52c767a9957ad -ra3e987093464232bfb4536f3335acc9851291b95
--- lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp	(.../optionlist.jsp)	(revision c56857991e269aa7f5bd250a05b52c767a9957ad)
+++ lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp	(.../optionlist.jsp)	(revision a3e987093464232bfb4536f3335acc9851291b95)
@@ -2,12 +2,12 @@
 <c:set var="ctxPath" value="${pageContext.request.contextPath}"	scope="request" />
 <c:set var="listSize" value="${fn:length(optionList)}" />
 <div id="optionArea">
-	<form id="optionForm">
+	<form id="optionForm" name="optionForm">
 		<input type="hidden" name="optionCount" id="optionCount" value="${listSize}">
-
+	
 		<div class="field-name space-top">
 			<fmt:message key="label.authoring.basic.answer.options" />
-			<img src="${ctxPath}/includes/images/indicator.gif"	style="display:none" id="optionArea_Busy" />			
+			<img src="${ctxPath}/includes/images/indicator.gif"	style="display:none" id="optionArea_Busy" />	
 		</div>
 
 		<table class="alternative-color" cellspacing="0">
@@ -27,7 +27,7 @@
 								<td style="padding-left:0px; border-bottom:0px; background:none;">	
 									<input type="hidden" name="optionSequenceId${status.index}" id="optionSequenceId${status.index}" value="${option.sequenceId}">									
 									<input type="text" name="optionAnswer${status.index}"
-										id="optionAnswer${status.index}" size="57" value="${option.answerString}">
+										id="optionAnswer${status.index}" size="7" value="${option.answerString}">
 								</td>									
 								
 							</tr>
@@ -96,7 +96,7 @@
 						</table>
 					</td>
 					
-					<td width="40px" style="padding-left:0px; vertical-align:middle;">
+					<td width="40px" style="vertical-align:middle;">
 						<c:if test="${not status.first}">
 							<img src="<html:rewrite page='/includes/images/uparrow.gif'/>"
 								border="0" title="<fmt:message key="label.authoring.basic.up"/>"