Index: lams_tool_assessment/web/includes/css/addQuestion.scss
===================================================================
diff -u -r8a65083cf102509e0ca486f636746f56a600c514 -rba5d276f1fd9c153812980bf28ce318b714a664b
--- lams_tool_assessment/web/includes/css/addQuestion.scss	(.../addQuestion.scss)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
+++ lams_tool_assessment/web/includes/css/addQuestion.scss	(.../addQuestion.scss)	(revision ba5d276f1fd9c153812980bf28ce318b714a664b)
@@ -34,6 +34,9 @@
 .greyed-out-label {
 	opacity: 0.55;
 }
+#hasOptionFilled-error {
+	display: table;
+}
 
 /* overwriting bootstrap value. */
 .panel {
@@ -42,6 +45,12 @@
 .panel-default>.panel-heading {
 	border-color: transparent;
 }
+#unitArea .table>tbody>tr>td {
+    border-top: none;
+}
+label.alert {
+	display: initial;
+}
 .input-xs {
   height: 22px;
   padding: 2px 5px;
@@ -162,7 +171,7 @@
     bottom: 0;
     width: 100%;
     height: 44px;
-    background-color: #f5f5f5;
+    background-color: #f9f9f9;
 }
 footer > div {
 	height: 44px;
Index: lams_tool_assessment/web/pages/authoring/parts/addessay.jsp
===================================================================
diff -u -r8a65083cf102509e0ca486f636746f56a600c514 -rba5d276f1fd9c153812980bf28ce318b714a664b
--- lams_tool_assessment/web/pages/authoring/parts/addessay.jsp	(.../addessay.jsp)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
+++ lams_tool_assessment/web/pages/authoring/parts/addessay.jsp	(.../addessay.jsp)	(revision ba5d276f1fd9c153812980bf28ce318b714a664b)
@@ -18,76 +18,76 @@
     <script>
 		$(document).ready(function(){
 		    $("#assessmentQuestionForm").validate({
-		    		ignore: 'hidden',
-		    		rules: {
-		    			title: "required",
-		    			defaultGrade: {
-		    			      required: true,
-		    			      digits: true
-		    			}
-		    		},
-		    		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'/>"
-		    			}
-		    		},
-		    	    invalidHandler: formInvalidHandler,
-		    		debug: true,
-		    		errorClass: "alert alert-danger",
-     			    submitHandler: function(form) {
-		    			$("#question").val(CKEDITOR.instances.question.getData());
-		    			$("#generalFeedback").val(CKEDITOR.instances.generalFeedback.getData());
+		    	ignore: 'hidden',
+		    	rules: {
+		    		title: "required",
+		    		defaultGrade: {
+		    		      required: true,
+		    		      digits: true
+		    		}
+		    	},
+	    		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'/>"
+	    			}
+	    		},
+	    	    invalidHandler: formInvalidHandler,
+	    		debug: true,
+	    		errorClass: "alert alert-danger",
+   			    submitHandler: function(form) {
+	    			$("#question").val(CKEDITOR.instances.question.getData());
+	    			$("#generalFeedback").val(CKEDITOR.instances.generalFeedback.getData());
 	     			    
-		    	    	var options = { 
-		    	    		target:  parent.jQuery('#questionListArea'), 
-		    		   		success: afterRatingSubmit  // post-submit callback
-		    		    }; 				
+	    	    	var options = { 
+	    	    		target:  parent.jQuery('#questionListArea'), 
+	    		   		success: afterRatingSubmit  // post-submit callback
+	    		    }; 				
 		    		    				
-		    			$('#assessmentQuestionForm').ajaxSubmit(options);
-		    		}
+	    			$('#assessmentQuestionForm').ajaxSubmit(options);
+	    		}
 		  	});
 		    	
-		    	//spinner
-		    	var validateMinMax = function() {
-		    			// min can't be more than max
-		    			var min = $( "#min-words-limit" ),
-		    				max = $( "#max-words-limit" ),
-		    				minVal = +min.val(),
-		    				maxVal = +max.val();
-		    			if (minVal > maxVal){
-		    				max.val(minVal);
-		    			}
-		    		},
-		    		maximumWordsSpinner = $( "#max-words-limit" ).spinner({ 
-			    		min: 0,
-			    		disabled: ($( "#max-words-limit" ).val() == 0),
-			    		change: validateMinMax,
-			    		stop: validateMinMax
-		    		}),
-		    		minimumWordsSpinner = $( "#min-words-limit" ).spinner({ 
-			    		min: 0,
-			    		disabled: ($( "#min-words-limit" ).val() == 0),
-			    		change: validateMinMax,
-			    		stop: validateMinMax
-		    		});
-		    	$("#max-words-limit-checkbox").click(function() {
-		    		if ( maximumWordsSpinner.spinner( "option", "disabled" ) ) {
-		    			 maximumWordsSpinner.spinner( "enable" );
-		    		} else {
-		    			maximumWordsSpinner.spinner( "disable" );
-		    		}
-		        });
+		   	//spinner
+	    	var validateMinMax = function() {
+	    		// min can't be more than max
+	    		var min = $( "#min-words-limit" ),
+	    			max = $( "#max-words-limit" ),
+	    			minVal = +min.val(),
+	    			maxVal = +max.val();
+	    		if (minVal > maxVal){
+	    			max.val(minVal);
+	    		}
+	    	},
+		    	maximumWordsSpinner = $( "#max-words-limit" ).spinner({ 
+			   		min: 0,
+			   		disabled: ($( "#max-words-limit" ).val() == 0),
+			   		change: validateMinMax,
+			   		stop: validateMinMax
+		    	}),
+		    	minimumWordsSpinner = $( "#min-words-limit" ).spinner({ 
+			   		min: 0,
+			   		disabled: ($( "#min-words-limit" ).val() == 0),
+			   		change: validateMinMax,
+			   		stop: validateMinMax
+		    	});
+	    	$("#max-words-limit-checkbox").click(function() {
+	    		if ( maximumWordsSpinner.spinner( "option", "disabled" ) ) {
+	    			 maximumWordsSpinner.spinner( "enable" );
+	    		} else {
+	    			maximumWordsSpinner.spinner( "disable" );
+	    		}
+	        });
 		    	
-		    	//spinner
-		    	$("#min-words-limit-checkbox").click(function() {
-		    		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
-		    			minimumWordsSpinner.spinner( "enable" );
-		    		} else {
-		    			minimumWordsSpinner.spinner( "disable" );
-		    		}
-		        });
+		    //spinner
+	    	$("#min-words-limit-checkbox").click(function() {
+	    		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+	    			minimumWordsSpinner.spinner( "enable" );
+	    		} else {
+	    			minimumWordsSpinner.spinner( "disable" );
+	    		}
+	        });
 		});
   	</script>
 </lams:head>
Index: lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp
===================================================================
diff -u -r8a65083cf102509e0ca486f636746f56a600c514 -rba5d276f1fd9c153812980bf28ce318b714a664b
--- lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
+++ lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision ba5d276f1fd9c153812980bf28ce318b714a664b)
@@ -5,53 +5,121 @@
 <lams:html>
 <lams:head>
 	<%@ include file="/common/authoringQuestionHeader.jsp"%>
+	<link href="https://gitcdn.github.io/bootstrap-toggle/2.2.2/css/bootstrap-toggle.min.css" rel="stylesheet">
+	<script src="https://gitcdn.github.io/bootstrap-toggle/2.2.2/js/bootstrap-toggle.min.js"></script>
+	<style>
+	
+	/* --- SWITCH --- */
+	
+.switch {
+  position: relative;
+  display: inline-block;
+  width: 40px;
+  height: 23px;
+}
+
+.switch input { 
+  opacity: 0;
+  width: 0;
+  height: 0;
+}
+
+.switch-slider {
+  position: absolute;
+  cursor: pointer;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: #ccc;
+  -webkit-transition: .4s;
+  transition: .4s;
+}
+
+.switch-slider:before {
+  position: absolute;
+  content: "";
+  height: 17px;
+  width: 17px;
+  left: 3px;
+  bottom: 0.2em;
+  background-color: white;
+  -webkit-transition: .4s;
+  transition: .4s;
+}
+
+input:checked ~ .switch-slider {
+  background-color: #2196F3;
+}
+
+input:focus ~ .switch-slider {
+  box-shadow: 0 0 1px #2196F3;
+}
+
+input:checked ~ .switch-slider:before {
+  -webkit-transform: translateX(17px);
+  -ms-transform: translateX(17px);
+  transform: translateX(17px);
+}
+
+/* Rounded switch-sliders */
+.switch-slider.round {
+  border-radius: 23px;
+}
+
+.switch-slider.round:before {
+  border-radius: 50%;
+}
+	
+	</style>
+	
     <script>
 		$(document).ready(function(){
 		    $("#assessmentQuestionForm").validate({
-		    		ignore: 'hidden',
-		    		rules: {
-		    			title: "required",
-		    			defaultGrade: {
-		    			      required: true,
-		    			      digits: true
-		    			},
-		    			hasOptionFilled: {
-		    				required: function(element) {
-				    			prepareOptionEditorsForAjaxSubmit();
-		    		        	return $("textarea[name^=optionString]:filled").length < 1;
-			    		    }			    		    
-	    			    }
+		    	ignore: 'hidden',
+		    	rules: {
+		    		title: "required",
+		    		defaultGrade: {
+		    		      required: true,
+		    		      digits: true
 		    		},
-		    		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'/>"
-		    			},
-		    			hasOptionFilled: {
-		    				required: "<fmt:message key='label.authoring.numerical.error.answer'/>"
-		    			}
+		    		hasOptionFilled: {
+		    			required: function(element) {
+				   			prepareOptionEditorsForAjaxSubmit();
+		    	        	return $("textarea[name^=optionString]:filled").length < 1;
+			    	    }			    		    
+	    		    }
+		    	},
+		    	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'/>"
 		    		},
-		    	    invalidHandler: formInvalidHandler,
-		    		debug: true,
-		    		errorClass: "alert alert-danger",
-     			    submitHandler: function(form) {
-     			    	prepareOptionEditorsForAjaxSubmit();
-		    			$("#optionList").val($("#optionForm").serialize(true));
-		    			$("#question").val(CKEDITOR.instances.question.getData());
-		    			$("#generalFeedback").val(CKEDITOR.instances.generalFeedback.getData());
-		    			$("#feedbackOnCorrect").val(CKEDITOR.instances.feedbackOnCorrect.getData());
-		    			$("#feedbackOnPartiallyCorrect").val(CKEDITOR.instances.feedbackOnPartiallyCorrect.getData());
-		    			$("#feedbackOnIncorrect").val(CKEDITOR.instances.feedbackOnIncorrect.getData());
+		    		hasOptionFilled: {
+		    			required: "<fmt:message key='label.authoring.numerical.error.answer'/>"
+		    		}
+		    	},
+		    	   invalidHandler: formInvalidHandler,
+		    	debug: true,
+		    	errorClass: "alert alert-danger",
+     			submitHandler: function(form) {
+     			   	prepareOptionEditorsForAjaxSubmit();
+		    		$("#optionList").val($("#optionForm").serialize(true));
+		    		$("#question").val(CKEDITOR.instances.question.getData());
+		    		$("#generalFeedback").val(CKEDITOR.instances.generalFeedback.getData());
+		    		$("#feedbackOnCorrect").val(CKEDITOR.instances.feedbackOnCorrect.getData());
+		    		$("#feedbackOnPartiallyCorrect").val(CKEDITOR.instances.feedbackOnPartiallyCorrect.getData());
+		    		$("#feedbackOnIncorrect").val(CKEDITOR.instances.feedbackOnIncorrect.getData());
 		    			
-		    	    	var options = { 
-		    	    		target:  parent.jQuery('#questionListArea'), 
-		    		   		success: afterRatingSubmit  // post-submit callback
-		    		    }; 				
+		    	   	var options = { 
+		    	   		target:  parent.jQuery('#questionListArea'), 
+		    	   		success: afterRatingSubmit  // post-submit callback
+		    	    }; 				
 		    		    				
-		    			$('#assessmentQuestionForm').ajaxSubmit(options);
-		    		}
-		  		});    	
+		    		$('#assessmentQuestionForm').ajaxSubmit(options);
+		    	}
+		  	});    	
 		});   
  	</script>
 </lams:head>
@@ -105,13 +173,14 @@
 							<span></span>
 						</lams:Alert>	
 				    </div>
-				    
-					<div class="checkbox">
-						<label for="answer-required">
-							<form:checkbox path="answerRequired" id="answer-required"/>
-							<fmt:message key="label.authoring.answer.required" />
-						</label>
-					</div>
+
+					<label class="switch">
+						<form:checkbox path="answerRequired" id="answer-required"/>
+						<span class="switch-slider round"></span>
+					</label>
+					<label for="answer-required">
+						<fmt:message key="label.authoring.answer.required" />
+					</label>
 	
 					<c:if test="${!isAuthoringRestricted}">
 						<div class="form-group form-inline">
@@ -122,17 +191,23 @@
 						    <form:input path="defaultGrade" cssClass="form-control short-input-text input-sm"/>
 						</div>
 					</c:if>
-						
-					<div class="checkbox">
-						<label for="shuffle">
+					
+					<div>
+						<label class="switch">
 							<form:checkbox path="shuffle" id="shuffle"/>
+							<span class="switch-slider round"></span>
+						</label>
+						<label for="shuffle">		
 							<fmt:message key="label.authoring.basic.shuffle.the.choices" />
 						</label>
 					</div>
 					
-					<div class="checkbox">
-						<label for="hedging-justification">
+					<div>
+						<label class="switch">
 							<form:checkbox path="hedgingJustificationEnabled" id="hedging-justification"/>
+							<span class="switch-slider round"></span>
+						</label>
+						<label for="hedging-justification">
 							<fmt:message key="label.ask.for.hedging.justification" />
 						</label>
 					</div>
Index: lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp
===================================================================
diff -u -r8a65083cf102509e0ca486f636746f56a600c514 -rba5d276f1fd9c153812980bf28ce318b714a664b
--- lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
+++ lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision ba5d276f1fd9c153812980bf28ce318b714a664b)
@@ -7,53 +7,53 @@
 	<%@ include file="/common/authoringQuestionHeader.jsp"%>
     <script>
 		$(document).ready(function(){
-		    	$("#assessmentQuestionForm").validate({
-		    		ignore: 'hidden',
-		    		rules: {
-		    			title: "required",
-		    			defaultGrade: {
-		    			      required: true,
-		    			      digits: true
-		    			},
-		    			penaltyFactor: {
-		    			      required: true,
-		    			      number: true
-		    			},
-		    			hasOptionFilled: {
-		    				required: function(element) {
-		    					prepareOptionEditorsForAjaxSubmit();	    				
-		    		        	return $("textarea[name^=optionQuestion]:filled").length < 1;
-			    		    }
-	    			    }
+		    $("#assessmentQuestionForm").validate({
+		    	ignore: 'hidden',
+		    	rules: {
+		    		title: "required",
+		    		defaultGrade: {
+		    	    	required: true,
+		    		    digits: true
 		    		},
-		    		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'/>"
-		    			},
-		    			hasOptionFilled: "<fmt:message key='label.authoring.matching.pairs.error.one.matching.pair'/>"
+		    		penaltyFactor: {
+		    		    required: true,
+		    		    number: true
 		    		},
-		    	    invalidHandler: formInvalidHandler,
-		    		debug: true,
-		    		errorClass: "alert alert-danger",
-     			    submitHandler: function(form) {
-		    			$("#optionList").val($("#optionForm").serialize(true));
-		    			$("#question").val(CKEDITOR.instances.question.getData());
-		    			$("#generalFeedback").val(CKEDITOR.instances.generalFeedback.getData());
+		    		hasOptionFilled: {
+		    			required: function(element) {
+		    				prepareOptionEditorsForAjaxSubmit();	    				
+		    		       	return $("textarea[name^=optionQuestion]:filled").length < 1;
+			    	    }
+	    			   }
+		    	},
+	    		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'/>"
+	    			},
+	    			hasOptionFilled: "<fmt:message key='label.authoring.matching.pairs.error.one.matching.pair'/>"
+	    		},
+	    	    invalidHandler: formInvalidHandler,
+	    		debug: true,
+	    		errorClass: "alert alert-danger",
+   			    submitHandler: function(form) {
+	    			$("#optionList").val($("#optionForm").serialize(true));
+	    			$("#question").val(CKEDITOR.instances.question.getData());
+	    			$("#generalFeedback").val(CKEDITOR.instances.generalFeedback.getData());
 		    			
-		    	    	var options = { 
-		    	    		target:  parent.jQuery('#questionListArea'), 
-		    		   		success: afterRatingSubmit  // post-submit callback
-		    		    }; 				
+	    	    	var options = { 
+	    	    		target:  parent.jQuery('#questionListArea'), 
+	    		   		success: afterRatingSubmit  // post-submit callback
+	    		    }; 				
 		    		    				
-		    			$('#assessmentQuestionForm').ajaxSubmit(options);
-		    		}
-		  		});
+	    			$('#assessmentQuestionForm').ajaxSubmit(options);
+	    		}
+	  		});
 		}); 
 	</script>
 </lams:head>
Index: lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp
===================================================================
diff -u -r8a65083cf102509e0ca486f636746f56a600c514 -rba5d276f1fd9c153812980bf28ce318b714a664b
--- lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
+++ lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision ba5d276f1fd9c153812980bf28ce318b714a664b)
@@ -8,69 +8,69 @@
     <script>
 		$(document).ready(function(){
 		    $("#assessmentQuestionForm").validate({
-		    		ignore: 'hidden',
-		    		rules: {
-		    			title: "required",
-		    			defaultGrade: {
-		    			    required: true,
-		    			    digits: true
-		    			},
-		    			penaltyFactor: {
-		    			    required: true,
-		    			    number: true
-		    			},
-		    			hasOptionFilled: {
-		    				required: function(element) {
-				    			prepareOptionEditorsForAjaxSubmit();
-		    		        	return $("textarea[name^=optionString]:filled").length < 1;
-			    		    }			    		    
-	    			    },
-	    			    hasOneHundredGrade: {
-		    				required: function(element) {
-		    					var hasOneHundredGrade = false;
-		    					$("input[name^='optionGrade']").each(function() {
-		    						hasOneHundredGrade = hasOneHundredGrade || (eval(this.value) == 1);
-		    					});
-	    			    		return !hasOneHundredGrade && !eval($("#multipleAnswersAllowed").val());
-			    		    }		    		    
-	    			    }
-		    		},
-		    		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'/>"
-		    			},
-		    			hasOptionFilled: {
-		    				required: "<fmt:message key='label.authoring.numerical.error.answer'/>"
-		    			},
-		    			hasOneHundredGrade: {
-		    				required: "<fmt:message key='error.form.validation.hundred.score'/>"
-		    			}
-		    		},
-		    	    invalidHandler: formInvalidHandler,
-		    		debug: true,
-		    		errorClass: "alert alert-danger",
-     			    submitHandler: function(form) {
-     			    	prepareOptionEditorsForAjaxSubmit();
-		    			$("#optionList").val($("#optionForm").serialize(true));
-		    			$("#question").val(CKEDITOR.instances.question.getData());
-		    			$("#generalFeedback").val(CKEDITOR.instances.generalFeedback.getData());
-		    			$("#feedbackOnCorrect").val(CKEDITOR.instances.feedbackOnCorrect.getData());
-		    			$("#feedbackOnPartiallyCorrect").val(CKEDITOR.instances.feedbackOnPartiallyCorrect.getData());
-		    			$("#feedbackOnIncorrect").val(CKEDITOR.instances.feedbackOnIncorrect.getData());
+		    	ignore: 'hidden',
+	    		rules: {
+	    			title: "required",
+	    			defaultGrade: {
+	    			    required: true,
+	    			    digits: true
+	    			},
+	    			penaltyFactor: {
+	    			    required: true,
+	    			    number: true
+	    			},
+	    			hasOptionFilled: {
+	    				required: function(element) {
+			    			prepareOptionEditorsForAjaxSubmit();
+	    		        	return $("textarea[name^=optionString]:filled").length < 1;
+		    		    }			    		    
+    			    },
+    			    hasOneHundredGrade: {
+	    				required: function(element) {
+	    					var hasOneHundredGrade = false;
+	    					$("input[name^='optionGrade']").each(function() {
+	    						hasOneHundredGrade = hasOneHundredGrade || (eval(this.value) == 1);
+	    					});
+    			    		return !hasOneHundredGrade && !eval($("#multipleAnswersAllowed").val());
+		    		    }		    		    
+    			    }
+	    		},
+	    		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'/>"
+	    			},
+	    			hasOptionFilled: {
+	    				required: "<fmt:message key='label.authoring.numerical.error.answer'/>"
+	    			},
+	    			hasOneHundredGrade: {
+	    				required: "<fmt:message key='error.form.validation.hundred.score'/>"
+	    			}
+	    		},
+	    	    invalidHandler: formInvalidHandler,
+	    		debug: true,
+	    		errorClass: "alert alert-danger",
+   			    submitHandler: function(form) {
+   			    	prepareOptionEditorsForAjaxSubmit();
+	    			$("#optionList").val($("#optionForm").serialize(true));
+	    			$("#question").val(CKEDITOR.instances.question.getData());
+	    			$("#generalFeedback").val(CKEDITOR.instances.generalFeedback.getData());
+	    			$("#feedbackOnCorrect").val(CKEDITOR.instances.feedbackOnCorrect.getData());
+	    			$("#feedbackOnPartiallyCorrect").val(CKEDITOR.instances.feedbackOnPartiallyCorrect.getData());
+	    			$("#feedbackOnIncorrect").val(CKEDITOR.instances.feedbackOnIncorrect.getData());
 		    			
-		    	    	var options = { 
-		    	    		target:  parent.jQuery('#questionListArea'), 
-		    		   		success: afterRatingSubmit  // post-submit callback
-		    		    }; 				
+	    	    	var options = { 
+	    	    		target:  parent.jQuery('#questionListArea'), 
+	    		   		success: afterRatingSubmit  // post-submit callback
+	    		    }; 				
 		    		    				
-		    			$('#assessmentQuestionForm').ajaxSubmit(options);
-		    		}
+	    			$('#assessmentQuestionForm').ajaxSubmit(options);
+	    		}
 		  	});
 		    	
 			$("#multipleAnswersAllowed").on('change', function() {
Index: lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp
===================================================================
diff -u -r8a65083cf102509e0ca486f636746f56a600c514 -rba5d276f1fd9c153812980bf28ce318b714a664b
--- lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	(.../addnumerical.jsp)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
+++ lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	(.../addnumerical.jsp)	(revision ba5d276f1fd9c153812980bf28ce318b714a664b)
@@ -110,7 +110,7 @@
     			$("#unitArea").load(
     				url,
     				{
-    					questionType: questionType,
+    					questionType: QUESTION_TYPE,
     					unitList: unitList 
     				}
     			);
Index: lams_tool_assessment/web/pages/authoring/parts/addordering.jsp
===================================================================
diff -u -r8a65083cf102509e0ca486f636746f56a600c514 -rba5d276f1fd9c153812980bf28ce318b714a664b
--- lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	(.../addordering.jsp)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
+++ lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	(.../addordering.jsp)	(revision ba5d276f1fd9c153812980bf28ce318b714a664b)
@@ -57,7 +57,6 @@
 		    			$('#assessmentQuestionForm').ajaxSubmit(options);
 		    		}
 		  		});
-		    	
 			});
   		</script>
 </lams:head>
Index: lams_tool_assessment/web/pages/authoring/parts/numericaloption.jsp
===================================================================
diff -u -r8a65083cf102509e0ca486f636746f56a600c514 -rba5d276f1fd9c153812980bf28ce318b714a664b
--- lams_tool_assessment/web/pages/authoring/parts/numericaloption.jsp	(.../numericaloption.jsp)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
+++ lams_tool_assessment/web/pages/authoring/parts/numericaloption.jsp	(.../numericaloption.jsp)	(revision ba5d276f1fd9c153812980bf28ce318b714a664b)
@@ -9,8 +9,8 @@
 		<td>
 			<div class="form-inline">    	
 				<input type="text" name="optionFloat${status.index}" value="${option.optionFloat}" 
-						id="optionFloat${status.index}" class="number form-control short-input-text input-xs" 
-						title="<fmt:message key='label.authoring.choice.enter.float'/>">
+					id="optionFloat${status.index}" class="number form-control short-input-text input-xs" 
+					title="<fmt:message key='label.authoring.choice.enter.float'/>">
 			</div>
 		</td>
 	</tr>
@@ -22,8 +22,8 @@
 		<td>
 			<div class="form-inline">	
 				<input type="text" name="optionAcceptedError${status.index}" value="${option.acceptedError}"
-						id="optionAcceptedError${status.index}" class="number form-control short-input-text input-xs" 
-						title="<fmt:message key='label.authoring.choice.enter.float'/>">
+					id="optionAcceptedError${status.index}" class="number form-control short-input-text input-xs" 
+					title="<fmt:message key='label.authoring.choice.enter.float'/>">
 			</div>
 		</td>
 	</tr>
Index: lams_tool_assessment/web/pages/authoring/parts/optionhedgingmark.jsp
===================================================================
diff -u -r8a65083cf102509e0ca486f636746f56a600c514 -rba5d276f1fd9c153812980bf28ce318b714a664b
--- lams_tool_assessment/web/pages/authoring/parts/optionhedgingmark.jsp	(.../optionhedgingmark.jsp)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
+++ lams_tool_assessment/web/pages/authoring/parts/optionhedgingmark.jsp	(.../optionhedgingmark.jsp)	(revision ba5d276f1fd9c153812980bf28ce318b714a664b)
@@ -8,19 +8,25 @@
 </div>
 
 <div class="settings-on-hover-hidden">
-	<div class="radio">
-		<label for="option-correct">
-			<input type="radio" alt="${status.index}" name="optionCorrect" value="${option.sequenceId}" id="option-correct"
-					<c:if test="${option.correct}">checked="checked"</c:if> >
+
+	<div class="voffset5-bottom" style="margin-top: 5px;">
+		<input type="checkbox" name="optionCorrect" value="${option.sequenceId}" id="option-correct-${status.index}" data-toggle="toggle" data-on="Correct" data-off="Wrong" data-size="mini"
+			<c:if test="${option.correct}">checked="checked"</c:if>>
+	</div>
+				
+	<!--<div class="radio">
+		<label for="option-correct-${status.index}">
+			 <input type="radio" alt="${status.index}" name="optionCorrect" value="${option.sequenceId}" id="option-correct"
+					<c:if test="${option.correct}">checked="checked"</c:if> > 
 			<span class="greyed-out-label">
 				<fmt:message key="label.option.correct" />
 			</span>
 		</label>
-	</div>
+	</div>-->
 	
 	<div class="voffset5-bottom">
 	    <c:set var="FEEDBACK_LABEL"><fmt:message key="label.authoring.basic.option.feedback"/></c:set>
 	    <lams:CKEditor id="optionFeedback${status.index}" value="${option.feedback}"
-	    	placeholder="${FEEDBACK_LABEL}" contentFolderID="${contentFolderID}" height="50px"/>
+	    	placeholder="${FEEDBACK_LABEL}" contentFolderID="${contentFolderID}" height="40px"/>
 	</div>
 </div>
Index: lams_tool_assessment/web/pages/authoring/parts/unitlist.jsp
===================================================================
diff -u -r8698759db11e141a1c09438d81ebbef84b70d808 -rba5d276f1fd9c153812980bf28ce318b714a664b
--- lams_tool_assessment/web/pages/authoring/parts/unitlist.jsp	(.../unitlist.jsp)	(revision 8698759db11e141a1c09438d81ebbef84b70d808)
+++ lams_tool_assessment/web/pages/authoring/parts/unitlist.jsp	(.../unitlist.jsp)	(revision ba5d276f1fd9c153812980bf28ce318b714a664b)
@@ -17,9 +17,9 @@
 							</td>
 							<td>	
 								<input type="hidden" name="unitSequenceId${status.index}" value="${unit.sequenceId}" 
-										id="unitSequenceId${status.index}">						
+									id="unitSequenceId${status.index}">						
 								<input type="text" name="unitUnit${status.index}" value="${unit.unit}"
-										id="unitUnit${status.index}" class="form-control input-sm">
+									id="unitUnit${status.index}" class="form-control input-sm">
 							</td>									
 						</tr>
 						<tr>
@@ -34,8 +34,8 @@
 									</c:when>
 									<c:otherwise>
 										<input type="text" name="unitMultiplier${status.index}" value="${unit.multiplier}"
-												id="unitMultiplier${status.index}" class="number form-control short-input-text input-sm" 
-												title="<fmt:message key='label.authoring.choice.enter.float'/>">
+											id="unitMultiplier${status.index}" class="number form-control short-input-text input-sm" 
+											title="<fmt:message key='label.authoring.choice.enter.float'/>">
 									</c:otherwise>
 								</c:choose>							
 							</td>