Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
===================================================================
diff -u -r01dcdc170a8ba868c24d9503ef4662327f884a13 -r72100e7842f4ba7a26156d51d620235e5af78d5b
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 01dcdc170a8ba868c24d9503ef4662327f884a13)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 72100e7842f4ba7a26156d51d620235e5af78d5b)
@@ -48,19 +48,17 @@
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionErrors;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.assessment.AssessmentConstants;
 import org.lamsfoundation.lams.tool.assessment.model.Assessment;
-import org.lamsfoundation.lams.tool.assessment.model.AssessmentAnswerOption;
+import org.lamsfoundation.lams.tool.assessment.model.AssessmentQuestionOption;
 import org.lamsfoundation.lams.tool.assessment.model.AssessmentAttachment;
 import org.lamsfoundation.lams.tool.assessment.model.AssessmentOverallFeedback;
 import org.lamsfoundation.lams.tool.assessment.model.AssessmentQuestion;
@@ -69,15 +67,11 @@
 import org.lamsfoundation.lams.tool.assessment.service.AssessmentApplicationException;
 import org.lamsfoundation.lams.tool.assessment.service.IAssessmentService;
 import org.lamsfoundation.lams.tool.assessment.service.UploadAssessmentFileException;
-import org.lamsfoundation.lams.tool.assessment.util.AssessmentAnswerOptionComparator;
-import org.lamsfoundation.lams.tool.assessment.util.AssessmentOverallFeedbackComparator;
-import org.lamsfoundation.lams.tool.assessment.util.AssessmentQuestionComparator;
-import org.lamsfoundation.lams.tool.assessment.util.AssessmentUnitComparator;
+import org.lamsfoundation.lams.tool.assessment.util.SequencableComparator;
 import org.lamsfoundation.lams.tool.assessment.web.form.AssessmentForm;
 import org.lamsfoundation.lams.tool.assessment.web.form.AssessmentQuestionForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.FileValidatorUtil;
-import org.lamsfoundation.lams.util.NumberUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -156,8 +150,8 @@
 	    return downQuestion(mapping, form, request, response);
 	}	
 	// -----------------------Assessment Answer Option functions ---------------------------
-	if (param.equals("newOption")) {
-	    return newOption(mapping, form, request, response);
+	if (param.equals("addOption")) {
+	    return addOption(mapping, form, request, response);
 	}
 	if (param.equals("removeOption")) {
 	    return removeOption(mapping, form, request, response);
@@ -620,9 +614,9 @@
 	questionForm.setDefaultGrade("1");
 	questionForm.setPenaltyFactor("0.1");
 	
-	List<AssessmentAnswerOption> optionList = new ArrayList<AssessmentAnswerOption>();
+	List<AssessmentQuestionOption> optionList = new ArrayList<AssessmentQuestionOption>();
 	for (int i = 0; i < AssessmentConstants.INITIAL_OPTIONS_NUMBER; i++) {
-	    AssessmentAnswerOption option = new AssessmentAnswerOption();
+	    AssessmentQuestionOption option = new AssessmentQuestionOption();
 	    option.setSequenceId(i+1);
 	    option.setGrade(0);
 	    optionList.add(option);
@@ -801,13 +795,13 @@
      * @param response
      * @return
      */
-    private ActionForward newOption(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+    private ActionForward addOption(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
-	TreeSet<AssessmentAnswerOption> optionList = getOptionsFromRequest(request, false);
-	AssessmentAnswerOption option = new AssessmentAnswerOption();
+	TreeSet<AssessmentQuestionOption> optionList = getOptionsFromRequest(request, false);
+	AssessmentQuestionOption option = new AssessmentQuestionOption();
 	int maxSeq = 1;
 	if (optionList != null && optionList.size() > 0) {
-	    AssessmentAnswerOption last = optionList.last();
+	    AssessmentQuestionOption last = optionList.last();
 	    maxSeq = last.getSequenceId() + 1;
 	}
 	option.setSequenceId(maxSeq);
@@ -833,11 +827,11 @@
      */
     private ActionForward removeOption(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
-	Set<AssessmentAnswerOption> optionList = getOptionsFromRequest(request, false);
+	Set<AssessmentQuestionOption> optionList = getOptionsFromRequest(request, false);
 	int optionIndex = NumberUtils.stringToInt(request.getParameter(AssessmentConstants.PARAM_OPTION_INDEX), -1);
 	if (optionIndex != -1) {
-	    List<AssessmentAnswerOption> rList = new ArrayList<AssessmentAnswerOption>(optionList);
-	    AssessmentAnswerOption question = rList.remove(optionIndex);
+	    List<AssessmentQuestionOption> rList = new ArrayList<AssessmentQuestionOption>(optionList);
+	    AssessmentQuestionOption question = rList.remove(optionIndex);
 	    optionList.clear();
 	    optionList.addAll(rList);
 	}
@@ -879,15 +873,15 @@
     }
 
     private ActionForward switchOption(ActionMapping mapping, HttpServletRequest request, boolean up) {
-	Set<AssessmentAnswerOption> optionList = getOptionsFromRequest(request, false);
+	Set<AssessmentQuestionOption> optionList = getOptionsFromRequest(request, false);
 	
 	int optionIndex = NumberUtils.stringToInt(request.getParameter(AssessmentConstants.PARAM_OPTION_INDEX), -1);
 	if (optionIndex != -1) {
-	    List<AssessmentAnswerOption> rList = new ArrayList<AssessmentAnswerOption>(optionList);
+	    List<AssessmentQuestionOption> rList = new ArrayList<AssessmentQuestionOption>(optionList);
 	    
 	    // get current and the target item, and switch their sequnece
-	    AssessmentAnswerOption option = rList.get(optionIndex);
-	    AssessmentAnswerOption repOption;
+	    AssessmentQuestionOption option = rList.get(optionIndex);
+	    AssessmentQuestionOption repOption;
 	    if (up) {
 		repOption = rList.get(--optionIndex);
 	    } else {
@@ -954,7 +948,7 @@
 
 	// initial Overall feedbacks list
 	SortedSet<AssessmentOverallFeedback> overallFeedbackList = new TreeSet<AssessmentOverallFeedback>(
-		new AssessmentOverallFeedbackComparator());
+		new SequencableComparator());
 	if (!assessment.getOverallFeedbacks().isEmpty()) {
 	    overallFeedbackList.addAll(assessment.getOverallFeedbacks());
 	} else {
@@ -1035,7 +1029,7 @@
 	SortedSet<AssessmentQuestion> list = (SortedSet<AssessmentQuestion>) sessionMap
 		.get(AssessmentConstants.ATTR_QUESTION_LIST);
 	if (list == null) {
-	    list = new TreeSet<AssessmentQuestion>(new AssessmentQuestionComparator());
+	    list = new TreeSet<AssessmentQuestion>(new SequencableComparator());
 	    sessionMap.put(AssessmentConstants.ATTR_QUESTION_LIST, list);
 	}
 	return list;
@@ -1150,7 +1144,7 @@
 		|| (questionType == AssessmentConstants.QUESTION_TYPE_MATCHING_PAIRS)
 		|| (questionType == AssessmentConstants.QUESTION_TYPE_SHORT_ANSWER)
 		|| (questionType == AssessmentConstants.QUESTION_TYPE_NUMERICAL)) {
-	    Set<AssessmentAnswerOption> optionList = question.getAnswerOptions();
+	    Set<AssessmentQuestionOption> optionList = question.getQuestionOptions();
 	    request.setAttribute(AssessmentConstants.ATTR_OPTION_LIST, optionList);
 	}
 	if (questionType == AssessmentConstants.QUESTION_TYPE_NUMERICAL) {
@@ -1238,14 +1232,14 @@
 		|| (type == AssessmentConstants.QUESTION_TYPE_MATCHING_PAIRS)
 		|| (type == AssessmentConstants.QUESTION_TYPE_SHORT_ANSWER)
 		|| (type == AssessmentConstants.QUESTION_TYPE_NUMERICAL)) {
-	    Set<AssessmentAnswerOption> optionList = getOptionsFromRequest(request, true);
+	    Set<AssessmentQuestionOption> optionList = getOptionsFromRequest(request, true);
 	    Set options = new LinkedHashSet();
 	    int seqId = 0;
-	    for (AssessmentAnswerOption option : optionList) {
+	    for (AssessmentQuestionOption option : optionList) {
 		option.setSequenceId(seqId++);
 		options.add(option);
 	    }
-	    question.setAnswerOptions(options);
+	    question.setQuestionOptions(options);
 	}
 	// set units
 	if (type == AssessmentConstants.QUESTION_TYPE_NUMERICAL) {
@@ -1284,25 +1278,25 @@
      * @param isForSaving whether the blank options will be preserved or not 
      * 
      */
-    private TreeSet<AssessmentAnswerOption> getOptionsFromRequest(HttpServletRequest request, boolean isForSaving) {
+    private TreeSet<AssessmentQuestionOption> getOptionsFromRequest(HttpServletRequest request, boolean isForSaving) {
 	Map<String, String> paramMap = splitRequestParameter(request, AssessmentConstants.ATTR_OPTION_LIST);
 
 	int count = NumberUtils.stringToInt(paramMap.get(AssessmentConstants.ATTR_OPTION_COUNT));
 	int questionType = WebUtil.readIntParam(request,AssessmentConstants.ATTR_QUESTION_TYPE);
-	TreeSet<AssessmentAnswerOption> optionList = new TreeSet<AssessmentAnswerOption>(
-		new AssessmentAnswerOptionComparator());
+	TreeSet<AssessmentQuestionOption> optionList = new TreeSet<AssessmentQuestionOption>(
+		new SequencableComparator());
 	for (int i = 0; i < count; i++) {
 	    if ((questionType == AssessmentConstants.QUESTION_TYPE_MULTIPLE_CHOICE)
 		    || (questionType == AssessmentConstants.QUESTION_TYPE_SHORT_ANSWER)) {
-		String answerString = paramMap.get(AssessmentConstants.ATTR_OPTION_ANSWER_PREFIX + i);
-		if ((answerString == null) && isForSaving) {
+		String optionString = paramMap.get(AssessmentConstants.ATTR_OPTION_STRING_PREFIX + i);
+		if ((optionString == null) && isForSaving) {
 		    continue;
 		}
 
-		AssessmentAnswerOption option = new AssessmentAnswerOption();
+		AssessmentQuestionOption option = new AssessmentQuestionOption();
 		String sequenceId = paramMap.get(AssessmentConstants.ATTR_OPTION_SEQUENCE_ID_PREFIX + i);
 		option.setSequenceId(NumberUtils.stringToInt(sequenceId));
-		option.setAnswerString(answerString);
+		option.setOptionString(optionString);
 		float grade = Float.valueOf(paramMap.get(AssessmentConstants.ATTR_OPTION_GRADE_PREFIX + i));
 		option.setGrade(grade);
 		option.setFeedback((String) paramMap.get(AssessmentConstants.ATTR_OPTION_FEEDBACK_PREFIX + i));
@@ -1313,43 +1307,50 @@
 		    continue;
 		}
 		
-		AssessmentAnswerOption option = new AssessmentAnswerOption();
+		AssessmentQuestionOption option = new AssessmentQuestionOption();
 		String sequenceId = paramMap.get(AssessmentConstants.ATTR_OPTION_SEQUENCE_ID_PREFIX + i);		
 		option.setSequenceId(NumberUtils.stringToInt(sequenceId));
-		option.setAnswerString((String) paramMap.get(AssessmentConstants.ATTR_OPTION_ANSWER_PREFIX + i));
+		option.setOptionString((String) paramMap.get(AssessmentConstants.ATTR_OPTION_STRING_PREFIX + i));
 		option.setQuestion(question);
 		optionList.add(option);
 	    } else if (questionType == AssessmentConstants.QUESTION_TYPE_NUMERICAL) {
-		String answerString = paramMap.get(AssessmentConstants.ATTR_OPTION_ANSWER_PREFIX + i);
-		if ((answerString == null) && isForSaving) {
+		String optionFloatStr = paramMap.get(AssessmentConstants.ATTR_OPTION_FLOAT_PREFIX + i);
+		String acceptedErrorStr = paramMap.get(AssessmentConstants.ATTR_OPTION_ACCEPTED_ERROR_PREFIX + i);
+		String gradeStr = paramMap.get(AssessmentConstants.ATTR_OPTION_GRADE_PREFIX + i);
+		if (optionFloatStr.equals("0.0") && optionFloatStr.equals("0.0") && gradeStr.equals("0.0") && isForSaving) {
 		    continue;
 		}
 		
-		AssessmentAnswerOption option = new AssessmentAnswerOption();
+		AssessmentQuestionOption option = new AssessmentQuestionOption();
 		String sequenceId = paramMap.get(AssessmentConstants.ATTR_OPTION_SEQUENCE_ID_PREFIX + i);
 		option.setSequenceId(NumberUtils.stringToInt(sequenceId));
-		option.setAnswerString(answerString);
-		String acceptedErrorStr = paramMap.get(AssessmentConstants.ATTR_OPTION_ACCEPTED_ERROR_PREFIX + i);
-		if (isForSaving && !StringUtils.isBlank(acceptedErrorStr)) {
-		    float acceptedError = Float.valueOf(acceptedErrorStr);
-		    option.setAcceptedError(acceptedError);
-		} else {
-		    option.setAcceptedErrorStr(acceptedErrorStr);
+		try {
+		    float optionFloat = Float.valueOf(optionFloatStr);
+		    option.setOptionFloat(optionFloat);		    
+		} catch (Exception e) {
+		    option.setOptionFloat(0);
 		}
+		try {
+		    float acceptedError = Float.valueOf(acceptedErrorStr);
+		    option.setAcceptedError(acceptedError);	    
+		} catch (Exception e) {
+		    option.setAcceptedError(0);
+		}		
 		float grade = Float.valueOf(paramMap.get(AssessmentConstants.ATTR_OPTION_GRADE_PREFIX + i));
 		option.setGrade(grade);    
 		option.setFeedback((String) paramMap.get(AssessmentConstants.ATTR_OPTION_FEEDBACK_PREFIX + i));
 		optionList.add(option);
 	    } else if (questionType == AssessmentConstants.QUESTION_TYPE_ORDERING) {
-		String answerString = paramMap.get(AssessmentConstants.ATTR_OPTION_ANSWER_PREFIX + i);
-		if ((answerString == null) && isForSaving) {
+		String optionString = paramMap.get(AssessmentConstants.ATTR_OPTION_STRING_PREFIX + i);
+		if ((optionString == null) && isForSaving) {
 		    continue;
 		}
 
-		AssessmentAnswerOption option = new AssessmentAnswerOption();
+		AssessmentQuestionOption option = new AssessmentQuestionOption();
 		String sequenceId = paramMap.get(AssessmentConstants.ATTR_OPTION_SEQUENCE_ID_PREFIX + i);
 		option.setSequenceId(NumberUtils.stringToInt(sequenceId));
-		option.setAnswerString(answerString);
+		option.setOptionString(optionString);
+		option.setAnswerInt(i);
 		optionList.add(option);
 	    }
 	}
@@ -1365,7 +1366,7 @@
 	Map<String, String> paramMap = splitRequestParameter(request, AssessmentConstants.ATTR_UNIT_LIST);
 
 	int count = NumberUtils.stringToInt(paramMap.get(AssessmentConstants.ATTR_UNIT_COUNT));
-	TreeSet<AssessmentUnit> unitList = new TreeSet<AssessmentUnit>(new AssessmentUnitComparator());
+	TreeSet<AssessmentUnit> unitList = new TreeSet<AssessmentUnit>(new SequencableComparator());
 	for (int i = 0; i < count; i++) {
 	    String unitStr = paramMap.get(AssessmentConstants.ATTR_UNIT_UNIT_PREFIX + i);
 	    if (StringUtils.isBlank(unitStr) && isForSaving) {
@@ -1396,7 +1397,7 @@
     private TreeSet<AssessmentOverallFeedback> getOverallFeedbacksFromRequest(HttpServletRequest request, boolean skipBlankOverallFeedbacks) {
 	int count = NumberUtils.stringToInt(request.getParameter(AssessmentConstants.ATTR_OVERALL_FEEDBACK_COUNT));
 	TreeSet<AssessmentOverallFeedback> overallFeedbackList = new TreeSet<AssessmentOverallFeedback>(
-		new AssessmentOverallFeedbackComparator());
+		new SequencableComparator());
 	for (int i = 0; i < count; i++) {
 	    String gradeBoundaryStr = request
 		    .getParameter(AssessmentConstants.ATTR_OVERALL_FEEDBACK_GRADE_BOUNDARY_PREFIX + i);
@@ -1429,7 +1430,7 @@
 	
 	int count = NumberUtils.stringToInt(paramMap.get(AssessmentConstants.ATTR_OVERALL_FEEDBACK_COUNT));
 	TreeSet<AssessmentOverallFeedback> overallFeedbackList = new TreeSet<AssessmentOverallFeedback>(
-		new AssessmentOverallFeedbackComparator());
+		new SequencableComparator());
 	for (int i = 0; i < count; i++) {
 	    String gradeBoundaryStr = paramMap
 		    .get(AssessmentConstants.ATTR_OVERALL_FEEDBACK_GRADE_BOUNDARY_PREFIX + i);
Index: lams_tool_assessment/web/includes/javascript/assessmentoption.js
===================================================================
diff -u -r01dcdc170a8ba868c24d9503ef4662327f884a13 -r72100e7842f4ba7a26156d51d620235e5af78d5b
--- lams_tool_assessment/web/includes/javascript/assessmentoption.js	(.../assessmentoption.js)	(revision 01dcdc170a8ba868c24d9503ef4662327f884a13)
+++ lams_tool_assessment/web/includes/javascript/assessmentoption.js	(.../assessmentoption.js)	(revision 72100e7842f4ba7a26156d51d620235e5af78d5b)
@@ -65,15 +65,15 @@
 		);
 	}
 	function prepareFCKEditorsForAjaxSubmit(){
-		if ((questionType == 1) || (questionType == 3) || (questionType == 7)) {
-			$("[name^=optionAnswer]").each(function() {
+		if ((questionType == 1) ||  (questionType == 7)) {
+			$("[name^=optionString]").each(function() {
 				this.value = FCKeditorAPI.GetInstance(this.name).GetXHTML();
 			});
 		} else if (questionType == 2) {
 			$("[name^=optionQuestion]").each(function() {
 				this.value = FCKeditorAPI.GetInstance(this.name).GetXHTML();
 			});
-		} else if (questionType == 4) {
+		} else if ((questionType == 3) || (questionType == 4)) {
 			$("[name^=optionFeedback]").each(function() {
 				this.value = FCKeditorAPI.GetInstance(this.name).GetXHTML();
 			});
Index: lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp
===================================================================
diff -u -r596580465b9d0c2c7c50f9a1c42ca4ce6a91b523 -r72100e7842f4ba7a26156d51d620235e5af78d5b
--- lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision 596580465b9d0c2c7c50f9a1c42ca4ce6a91b523)
+++ lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision 72100e7842f4ba7a26156d51d620235e5af78d5b)
@@ -17,7 +17,7 @@
 
 		<script type="text/javascript">
 			var questionType = ${questionType};
-			var addOptionUrl = "<c:url value='/authoring/newOption.do'/>";
+			var addOptionUrl = "<c:url value='/authoring/addOption.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'/>";
Index: lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp
===================================================================
diff -u -r0faffe5afa6b1ff59a1cf550cfedaadfa7da7765 -r72100e7842f4ba7a26156d51d620235e5af78d5b
--- lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision 0faffe5afa6b1ff59a1cf550cfedaadfa7da7765)
+++ lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision 72100e7842f4ba7a26156d51d620235e5af78d5b)
@@ -17,7 +17,7 @@
 
 		<script type="text/javascript">
 			var questionType = ${questionType};
-			var addOptionUrl = "<c:url value='/authoring/newOption.do'/>";
+			var addOptionUrl = "<c:url value='/authoring/addOption.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'/>";
@@ -40,17 +40,17 @@
 		    			      required: true,
 		    			      number: true
 		    			},
-		    			hasAnswerFilled: {
+		    			hasOptionFilled: {
 		    				required: function(element) {
-				    			$("[name^=optionAnswer]").each(function() {
+				    			$("[name^=optionString]").each(function() {
 									this.value = FCKeditorAPI.GetInstance(this.name).GetXHTML();
 				    			});		    				
-		    		        	return $("input[name^=optionAnswer]:filled").length < 1;
+		    		        	return $("input[name^=optionString]:filled").length < 1;
 			    		    }			    		    
 	    			    },
 	    			    hasOneHundredGrade: {
 		    				required: function(element) {
-	    			    		return $("select[name^='optionGrade'][value='100.0']").length < 1;
+	    			    		return $("select[name^='optionGrade'][value='1.0']").length < 1;
 			    		    }			    		    
 	    			    }
 		    		},
@@ -64,7 +64,7 @@
 		    				required: "<fmt:message key='label.authoring.choice.field.required'/>",
 		    				number: "<fmt:message key='label.authoring.choice.enter.float'/>"
 		    			},
-		    			hasAnswerFilled: {
+		    			hasOptionFilled: {
 		    				required: "<fmt:message key='label.authoring.numerical.error.answer'/>"
 		    			},
 		    			hasOneHundredGrade: {
@@ -86,7 +86,7 @@
 		    		},
 		    		debug: true,
      			    submitHandler: function(form) {
-		    			$("[name^=optionAnswer]").each(function() {
+		    			$("[name^=optionString]").each(function() {
 							this.value = FCKeditorAPI.GetInstance(this.name).GetXHTML();
 		    			});
 		    			$("#optionList").val($("#optionForm").serialize(true));
@@ -188,7 +188,7 @@
 				<div class="field-name space-top">
 					<fmt:message key="label.authoring.basic.answer.options" />
 				</div>
-				<input type="hidden" name="hasAnswerFilled" id="hasAnswerFilled">
+				<input type="hidden" name="hasOptionFilled" id="hasOptionFilled">
 				<input type="hidden" name="hasOneHundredGrade" id="hasOneHundredGrade">
 			</html:form>
 			
Index: lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp
===================================================================
diff -u -r988d9fce322beaf579b828d5694f2260bbc17b51 -r72100e7842f4ba7a26156d51d620235e5af78d5b
--- lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	(.../addnumerical.jsp)	(revision 988d9fce322beaf579b828d5694f2260bbc17b51)
+++ lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	(.../addnumerical.jsp)	(revision 72100e7842f4ba7a26156d51d620235e5af78d5b)
@@ -17,7 +17,7 @@
 
 		<script type="text/javascript">
 			var questionType = ${questionType};
-			var addOptionUrl = "<c:url value='/authoring/newOption.do'/>";
+			var addOptionUrl = "<c:url value='/authoring/addOption.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'/>";
@@ -54,14 +54,14 @@
 		    			      required: true,
 		    			      number: true
 		    			},
-		    			hasAnswerFilled: {
+		    			hasOptionFilled: {
 		    				required: function(element) {
-		    		        	return $("input[name^=optionAnswer]:filled").length < 1;
+		    		        	return $("input[name^=optionFloat]:filled").length < 1;
 			    		    }			    		    
 	    			    },
 	    			    hasOneHundredGrade: {
 		    				required: function(element) {
-	    			    		return $("select[name^='optionGrade'][value='100.0']").length < 1;
+	    			    		return $("select[name^='optionGrade'][value='1.0']").length < 1;
 			    		    }			    		    
 	    			    },	    			    
 		    			unitList: {
@@ -85,7 +85,7 @@
 		    				required: "<fmt:message key='label.authoring.choice.field.required'/>",
 		    				number: "<fmt:message key='label.authoring.choice.enter.float'/>"
 		    			},
-		    			hasAnswerFilled: {
+		    			hasOptionFilled: {
 		    				required: "<fmt:message key='label.authoring.numerical.error.answer'/>"
 		    			},
 		    			hasOneHundredGrade: {
@@ -205,7 +205,7 @@
 				<div class="field-name space-top">
 					<fmt:message key="label.authoring.numerical.answers" />
 				</div>
-				<input type="hidden" name="hasAnswerFilled" id="hasAnswerFilled">
+				<input type="hidden" name="hasOptionFilled" id="hasOptionFilled">
 				<input type="hidden" name="hasOneHundredGrade" id="hasOneHundredGrade">
 			</html:form>
 			
Index: lams_tool_assessment/web/pages/authoring/parts/addordering.jsp
===================================================================
diff -u -r01dcdc170a8ba868c24d9503ef4662327f884a13 -r72100e7842f4ba7a26156d51d620235e5af78d5b
--- lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	(.../addordering.jsp)	(revision 01dcdc170a8ba868c24d9503ef4662327f884a13)
+++ lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	(.../addordering.jsp)	(revision 72100e7842f4ba7a26156d51d620235e5af78d5b)
@@ -17,7 +17,7 @@
 
 		<script type="text/javascript">
 			var questionType = ${questionType};
-			var addOptionUrl = "<c:url value='/authoring/newOption.do'/>";
+			var addOptionUrl = "<c:url value='/authoring/addOption.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'/>";
@@ -40,12 +40,12 @@
 		    			      required: true,
 		    			      number: true
 		    			},
-		    			hasAnswerFilled: {
+		    			hasOptionFilled: {
 		    				required: function(element) {
-				    			$("[name^=optionAnswer]").each(function() {
+				    			$("[name^=optionString]").each(function() {
 									this.value = FCKeditorAPI.GetInstance(this.name).GetXHTML();
 				    			});		    				
-		    		        	return $("input[name^=optionAnswer]:filled").length < 1;
+		    		        	return $("input[name^=optionString]:filled").length < 1;
 			    		    }			    		    
 	    			    }
 		    		},
@@ -59,7 +59,7 @@
 		    				required: "<fmt:message key='label.authoring.choice.field.required'/>",
 		    				number: "<fmt:message key='label.authoring.choice.enter.float'/>"
 		    			},
-		    			hasAnswerFilled: {
+		    			hasOptionFilled: {
 		    				required: "<fmt:message key='label.authoring.numerical.error.answer'/>"
 		    			}
 		    		},
@@ -78,7 +78,7 @@
 		    		},
 		    		debug: true,
      			    submitHandler: function(form) {
-		    			$("[name^=optionAnswer]").each(function() {
+		    			$("[name^=optionString]").each(function() {
 							this.value = FCKeditorAPI.GetInstance(this.name).GetXHTML();
 		    			});
 		    			$("#optionList").val($("#optionForm").serialize(true));
@@ -165,7 +165,7 @@
 				<div class="field-name space-top">
 					<fmt:message key="label.authoring.basic.answer.options" />
 				</div>
-				<input type="hidden" name="hasAnswerFilled" id="hasAnswerFilled">
+				<input type="hidden" name="hasOptionFilled" id="hasOptionFilled">
 			</html:form>
 			
 			<!-- Options -->
Index: lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp
===================================================================
diff -u -r596580465b9d0c2c7c50f9a1c42ca4ce6a91b523 -r72100e7842f4ba7a26156d51d620235e5af78d5b
--- lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision 596580465b9d0c2c7c50f9a1c42ca4ce6a91b523)
+++ lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision 72100e7842f4ba7a26156d51d620235e5af78d5b)
@@ -17,7 +17,7 @@
 
 		<script type="text/javascript">
 			var questionType = ${questionType};
-			var addOptionUrl = "<c:url value='/authoring/newOption.do'/>";
+			var addOptionUrl = "<c:url value='/authoring/addOption.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'/>";
@@ -40,17 +40,14 @@
 		    			      required: true,
 		    			      number: true
 		    			},
-		    			hasAnswerFilled: {
+		    			hasOptionFilled: {
 		    				required: function(element) {
-				    			$("[name^=optionAnswer]").each(function() {
-									this.value = FCKeditorAPI.GetInstance(this.name).GetXHTML();
-				    			});		    				
-		    		        	return $("input[name^=optionAnswer]:filled").length < 1;
+		    		        	return $("input[name^=optionString]:filled").length < 1;
 			    		    }			    		    
 	    			    },
 	    			    hasOneHundredGrade: {
 		    				required: function(element) {
-	    			    		return $("select[name^='optionGrade'][value='100.0']").length < 1;
+	    			    		return $("select[name^='optionGrade'][value='1.0']").length < 1;
 			    		    }			    		    
 	    			    }
 		    		},
@@ -64,7 +61,7 @@
 		    				required: "<fmt:message key='label.authoring.choice.field.required'/>",
 		    				number: "<fmt:message key='label.authoring.choice.enter.float'/>"
 		    			},
-		    			hasAnswerFilled: {
+		    			hasOptionFilled: {
 		    				required: "<fmt:message key='label.authoring.numerical.error.answer'/>"
 		    			},
 		    			hasOneHundredGrade: {
@@ -86,7 +83,7 @@
 		    		},
 		    		debug: true,
      			    submitHandler: function(form) {
-		    			$("[name^=optionAnswer]").each(function() {
+		    			$("[name^=optionFeedback]").each(function() {
 							this.value = FCKeditorAPI.GetInstance(this.name).GetXHTML();
 		    			});	     			    
 		    			$("#optionList").val($("#optionForm").serialize(true));
@@ -177,7 +174,7 @@
 				<div class="field-name space-top">
 					<fmt:message key="label.authoring.short.answer.answers" />
 				</div>
-				<input type="hidden" name="hasAnswerFilled" id="hasAnswerFilled">
+				<input type="hidden" name="hasOptionFilled" id="hasOptionFilled">
 				<input type="hidden" name="hasOneHundredGrade" id="hasOneHundredGrade">
 			</html:form>
 			
@@ -189,6 +186,7 @@
 				</a>
 			</form>
 			
+			<br><br><br>
 			<lams:ImgButtonWrapper>
 				<a href="#" onclick="$('#assessmentQuestionForm').submit();" class="button-add-item">
 					<fmt:message key="label.authoring.short.answer.add.short.answer" /> 
Index: lams_tool_assessment/web/pages/authoring/parts/gradeselector.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/authoring/parts/gradeselector.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/authoring/parts/gradeselector.jsp	(revision 72100e7842f4ba7a26156d51d620235e5af78d5b)
@@ -0,0 +1,43 @@
+				<html:select property="optionGrade${status.index}" value="${option.grade}">
+					<html:option value="1.0">100 %</html:option>
+					<html:option value="0.9">90 %</html:option>
+					<html:option value="0.83333">83.333 %</html:option>
+					<html:option value="0.8">80 %</html:option>
+					<html:option value="0.75">75%</html:option>
+					<html:option value="0.7">70 %</html:option>
+					<html:option value="0.66666">66.666 %</html:option>
+					<html:option value="0.6">60 %</html:option>
+					<html:option value="0.5">50 %</html:option>
+					<html:option value="0.4">40 %</html:option>
+					<html:option value="0.33333">33.333 %</html:option>
+					<html:option value="0.3">30 %</html:option>
+					<html:option value="0.25">25 %</html:option>
+					<html:option value="0.2">20 %</html:option>
+					<html:option value="0.16666">16.666 %</html:option>
+					<html:option value="0.142857">14.2857 %</html:option>
+					<html:option value="0.125">12.5 %</html:option>
+					<html:option value="0.11111">11.111 %</html:option>
+					<html:option value="0.1">10 %</html:option>
+					<html:option value="0.05">5 %</html:option>
+					<html:option value="0.0"><fmt:message key="label.authoring.basic.none" /></html:option>
+					<html:option value="-0.05">-5 %</html:option>	
+					<html:option value="-0.1">-10 %</html:option>
+					<html:option value="-0.11111">-11.111 %</html:option>
+					<html:option value="-0.125">-12.5 %</html:option>
+					<html:option value="-0.142857">-14.2857 %</html:option>
+					<html:option value="-0.16666">-16.666 %</html:option>
+					<html:option value="-0.2">-20 %</html:option>
+					<html:option value="-0.25">-25 %</html:option>
+					<html:option value="-0.3">-30 %</html:option>	
+					<html:option value="-0.33333">-33.333 %</html:option>
+					<html:option value="-0.4">-40 %</html:option>
+					<html:option value="-0.5">-50 %</html:option>
+					<html:option value="-0.6">-60 %</html:option>
+					<html:option value="-0.66666">-66.666 %</html:option>
+					<html:option value="-0.7">-70 %</html:option>
+					<html:option value="-0.75">-75 %</html:option>	
+					<html:option value="-0.8">-80 %</html:option>
+					<html:option value="-0.83333">-83.333 %</html:option>
+					<html:option value="-0.9">-90 %</html:option>
+					<html:option value="-1">-100 %</html:option>
+				</html:select>
Index: lams_tool_assessment/web/pages/authoring/parts/matchingpairoption.jsp
===================================================================
diff -u -r01dcdc170a8ba868c24d9503ef4662327f884a13 -r72100e7842f4ba7a26156d51d620235e5af78d5b
--- lams_tool_assessment/web/pages/authoring/parts/matchingpairoption.jsp	(.../matchingpairoption.jsp)	(revision 01dcdc170a8ba868c24d9503ef4662327f884a13)
+++ lams_tool_assessment/web/pages/authoring/parts/matchingpairoption.jsp	(.../matchingpairoption.jsp)	(revision 72100e7842f4ba7a26156d51d620235e5af78d5b)
@@ -24,8 +24,8 @@
 	</tr>
 	<tr>			
 		<td style="padding-left:10px; border-bottom:0px; background:none;" width="622px">	
-			<input type="text" name="optionAnswer${status.index}"
-				id="optionAnswer${status.index}" size="99" value="${option.answerString}">
+			<input type="text" name="optionString${status.index}"
+				id="optionString${status.index}" size="99" value="${option.optionString}">
 		</td>									
 	</tr>
 </table>
\ No newline at end of file
Index: lams_tool_assessment/web/pages/authoring/parts/numericaloption.jsp
===================================================================
diff -u -r01dcdc170a8ba868c24d9503ef4662327f884a13 -r72100e7842f4ba7a26156d51d620235e5af78d5b
--- lams_tool_assessment/web/pages/authoring/parts/numericaloption.jsp	(.../numericaloption.jsp)	(revision 01dcdc170a8ba868c24d9503ef4662327f884a13)
+++ lams_tool_assessment/web/pages/authoring/parts/numericaloption.jsp	(.../numericaloption.jsp)	(revision 72100e7842f4ba7a26156d51d620235e5af78d5b)
@@ -8,8 +8,8 @@
 			</span>
 		</td>
 		<td style="padding-left:10px; border-bottom:0px; background:none;">	
-			<input type="text" name="optionAnswer${status.index}"
-				id="optionAnswer${status.index}" size="25" value="${option.answerString}" class="number" title="<fmt:message key='label.authoring.choice.enter.float'/>">
+			<input type="text" name="optionFloat${status.index}"
+				id="optionFloat${status.index}" size="25" value="${option.optionFloat}" class="number" title="<fmt:message key='label.authoring.choice.enter.float'/>">
 		</td>									
 	</tr>
 	
@@ -21,7 +21,7 @@
 		</td>
 		<td style="padding-left:10px; border-bottom:0px; background:none;">	
 			<input type="text" name="optionAcceptedError${status.index}"
-				id="optionAcceptedError${status.index}" size="25" value="${option.acceptedErrorStr}" class="number" title="<fmt:message key='label.authoring.choice.enter.float'/>">
+				id="optionAcceptedError${status.index}" size="25" value="${option.acceptedError}" class="number" title="<fmt:message key='label.authoring.choice.enter.float'/>">
 		</td>									
 	</tr>	
 	
@@ -32,49 +32,7 @@
 			</span>
 		</td>
 		<td style="padding-left:10px; border-bottom:0px; background:none;">
-			<html:select property="optionGrade${status.index}" style="float: left" value="${option.grade}">
-				<html:option value="100.0">100 %</html:option>
-				<html:option value="90.0">90 %</html:option>
-				<html:option value="83.333">83.333 %</html:option>
-				<html:option value="80.0">80 %</html:option>
-				<html:option value="75.0">75%</html:option>
-				<html:option value="70.0">70 %</html:option>
-				<html:option value="66.666">66.666 %</html:option>
-				<html:option value="60.0">60 %</html:option>
-				<html:option value="50.0">50 %</html:option>
-				<html:option value="40.0">40 %</html:option>
-				<html:option value="33.333">33.333 %</html:option>
-				<html:option value="30.0">30 %</html:option>
-				<html:option value="25.0">25 %</html:option>
-				<html:option value="20.0">20 %</html:option>
-				<html:option value="16.666">16.666 %</html:option>
-				<html:option value="14.2857">14.2857 %</html:option>
-				<html:option value="12.5">12.5 %</html:option>
-				<html:option value="11.111">11.111 %</html:option>
-				<html:option value="10.0">10 %</html:option>
-				<html:option value="5.0">5 %</html:option>
-				<html:option value="0.0"><fmt:message key="label.authoring.basic.none" /></html:option>
-				<html:option value="-5.0">-5 %</html:option>	
-				<html:option value="-10.0">-10 %</html:option>
-				<html:option value="-11.111">-11.111 %</html:option>
-				<html:option value="-12.5">-12.5 %</html:option>
-				<html:option value="-14.2857">-14.2857 %</html:option>
-				<html:option value="-16.666">-16.666 %</html:option>
-				<html:option value="-20.0">-20 %</html:option>
-				<html:option value="-25.0">-25 %</html:option>
-				<html:option value="-30.0">-30 %</html:option>	
-				<html:option value="-33.333">-33.333 %</html:option>
-				<html:option value="-40.0">-40 %</html:option>
-				<html:option value="-50.0">-50 %</html:option>
-				<html:option value="-60.0">-60 %</html:option>
-				<html:option value="-66.666">-66.666 %</html:option>
-				<html:option value="-70.0">-70 %</html:option>
-				<html:option value="-75.0">-75 %</html:option>	
-				<html:option value="-80.0">-80 %</html:option>
-				<html:option value="-83.333">-83.333 %</html:option>
-				<html:option value="-90.0">-90 %</html:option>
-				<html:option value="-100.0">-100 %</html:option>
-			</html:select>
+			<%@ include file="gradeselector.jsp"%>
 		</td>
 	</tr>
 	<tr>
Index: lams_tool_assessment/web/pages/authoring/parts/option.jsp
===================================================================
diff -u -r596580465b9d0c2c7c50f9a1c42ca4ce6a91b523 -r72100e7842f4ba7a26156d51d620235e5af78d5b
--- lams_tool_assessment/web/pages/authoring/parts/option.jsp	(.../option.jsp)	(revision 596580465b9d0c2c7c50f9a1c42ca4ce6a91b523)
+++ lams_tool_assessment/web/pages/authoring/parts/option.jsp	(.../option.jsp)	(revision 72100e7842f4ba7a26156d51d620235e5af78d5b)
@@ -10,7 +10,7 @@
 	</tr>
 	<tr>		
 		<td style="padding-left:10px; border-bottom:0px; background:none;">	
-			<lams:FCKEditor id="optionAnswer${status.index}" value="${option.answerString}"
+			<lams:FCKEditor id="optionString${status.index}" value="${option.optionString}"
 				contentFolderID="${contentFolderID}" width="622px">
 			</lams:FCKEditor>					
 		</td>									
@@ -22,49 +22,7 @@
 				<fmt:message key="label.authoring.basic.option.grade"></fmt:message>
 			</span>
 			<span class="space-left">
-				<html:select property="optionGrade${status.index}" value="${option.grade}">
-					<html:option value="100.0">100 %</html:option>
-					<html:option value="90.0">90 %</html:option>
-					<html:option value="83.333">83.333 %</html:option>
-					<html:option value="80.0">80 %</html:option>
-					<html:option value="75.0">75%</html:option>
-					<html:option value="70.0">70 %</html:option>
-					<html:option value="66.666">66.666 %</html:option>
-					<html:option value="60.0">60 %</html:option>
-					<html:option value="50.0">50 %</html:option>
-					<html:option value="40.0">40 %</html:option>
-					<html:option value="33.333">33.333 %</html:option>
-					<html:option value="30.0">30 %</html:option>
-					<html:option value="25.0">25 %</html:option>
-					<html:option value="20.0">20 %</html:option>
-					<html:option value="16.666">16.666 %</html:option>
-					<html:option value="14.2857">14.2857 %</html:option>
-					<html:option value="12.5">12.5 %</html:option>
-					<html:option value="11.111">11.111 %</html:option>
-					<html:option value="10.0">10 %</html:option>
-					<html:option value="5.0">5 %</html:option>
-					<html:option value="0.0"><fmt:message key="label.authoring.basic.none" /></html:option>
-					<html:option value="-5.0">-5 %</html:option>	
-					<html:option value="-10.0">-10 %</html:option>
-					<html:option value="-11.111">-11.111 %</html:option>
-					<html:option value="-12.5">-12.5 %</html:option>
-					<html:option value="-14.2857">-14.2857 %</html:option>
-					<html:option value="-16.666">-16.666 %</html:option>
-					<html:option value="-20.0">-20 %</html:option>
-					<html:option value="-25.0">-25 %</html:option>
-					<html:option value="-30.0">-30 %</html:option>	
-					<html:option value="-33.333">-33.333 %</html:option>
-					<html:option value="-40.0">-40 %</html:option>
-					<html:option value="-50.0">-50 %</html:option>
-					<html:option value="-60.0">-60 %</html:option>
-					<html:option value="-66.666">-66.666 %</html:option>
-					<html:option value="-70.0">-70 %</html:option>
-					<html:option value="-75.0">-75 %</html:option>	
-					<html:option value="-80.0">-80 %</html:option>
-					<html:option value="-83.333">-83.333 %</html:option>
-					<html:option value="-90.0">-90 %</html:option>
-					<html:option value="-100.0">-100 %</html:option>
-				</html:select>
+				<%@ include file="gradeselector.jsp"%>
 			</span>
 		</td>
 	</tr>
Index: lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp
===================================================================
diff -u -r01dcdc170a8ba868c24d9503ef4662327f884a13 -r72100e7842f4ba7a26156d51d620235e5af78d5b
--- lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp	(.../optionlist.jsp)	(revision 01dcdc170a8ba868c24d9503ef4662327f884a13)
+++ lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp	(.../optionlist.jsp)	(revision 72100e7842f4ba7a26156d51d620235e5af78d5b)
@@ -8,12 +8,15 @@
 			<tr>
 				<td style="padding-left:10px; padding-top:15px; padding-bottom:15px;">
 					<c:choose>
-						<c:when test="${(questionType == 1) || (questionType == 3)}">
+						<c:when test="${questionType == 1}">
 							<%@ include file="option.jsp"%>
 						</c:when>
 						<c:when test="${questionType == 2}">
 							<%@ include file="matchingpairoption.jsp"%>
 						</c:when>
+						<c:when test="${questionType == 3}">
+							<%@ include file="shortansweroption.jsp"%>
+						</c:when>						
 						<c:when test="${questionType == 4}">
 							<%@ include file="numericaloption.jsp"%>
 						</c:when>	
Index: lams_tool_assessment/web/pages/authoring/parts/orderingoption.jsp
===================================================================
diff -u -r01dcdc170a8ba868c24d9503ef4662327f884a13 -r72100e7842f4ba7a26156d51d620235e5af78d5b
--- lams_tool_assessment/web/pages/authoring/parts/orderingoption.jsp	(.../orderingoption.jsp)	(revision 01dcdc170a8ba868c24d9503ef4662327f884a13)
+++ lams_tool_assessment/web/pages/authoring/parts/orderingoption.jsp	(.../orderingoption.jsp)	(revision 72100e7842f4ba7a26156d51d620235e5af78d5b)
@@ -10,7 +10,7 @@
 	</tr>
 	<tr>		
 		<td style="padding-left:10px; border-bottom:0px; background:none;">	
-			<lams:FCKEditor id="optionAnswer${status.index}" value="${option.answerString}"
+			<lams:FCKEditor id="optionString${status.index}" value="${option.optionString}"
 				contentFolderID="${contentFolderID}" width="622px">
 			</lams:FCKEditor>					
 		</td>									
Index: lams_tool_assessment/web/pages/authoring/parts/shortansweroption.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/authoring/parts/shortansweroption.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/authoring/parts/shortansweroption.jsp	(revision 72100e7842f4ba7a26156d51d620235e5af78d5b)
@@ -0,0 +1,41 @@
+<table>
+	<tr>
+		<td style="padding-left:10px; border-bottom:0px; vertical-align:middle; background:none;">
+			<input type="hidden" name="optionSequenceId${status.index}" id="optionSequenceId${status.index}" value="${option.sequenceId}">
+			<span class="field-name">
+				<fmt:message key="label.authoring.basic.option.answer"></fmt:message>
+				${status.index+1}
+			</span>
+		</td>
+	</tr>
+	<tr>		
+		<td style="padding-left:10px; border-bottom:0px; background:none;">	
+			<input type="text" name="optionString${status.index}" value="${option.optionString}" styleClass="noBorder" size="99"/>
+		</td>									
+	</tr>
+	
+	<tr>
+		<td style="padding-left:10px; border-bottom:0px; vertical-align:middle; background:none;">
+			<span class="field-name">
+				<fmt:message key="label.authoring.basic.option.grade"></fmt:message>
+			</span>
+			<span class="space-left">
+				<%@ include file="gradeselector.jsp"%>
+			</span>
+		</td>
+	</tr>
+	<tr>
+		<td style="padding-left:10px; border-bottom:0px; vertical-align:top; background:none;">
+			<span class="field-name">
+				<fmt:message key="label.authoring.basic.option.feedback"></fmt:message>
+			</span>
+		</td>
+	</tr>
+	<tr>		
+		<td style="padding-left:10px; padding-right:0px; border-bottom:0px; background:none;" width="622px">
+			<lams:FCKEditor id="optionFeedback${status.index}" value="${option.feedback}"
+				contentFolderID="${contentFolderID}" width="622px">
+			</lams:FCKEditor>		
+		</td>
+	</tr>	
+</table>