Index: lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r8a65083cf102509e0ca486f636746f56a600c514 -ra0aa698e675b0a2eb89e51cf645156ade0f93d64
--- lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision a0aa698e675b0a2eb89e51cf645156ade0f93d64)
@@ -13,8 +13,8 @@
 tool.description  =Tool for assessing learners.
 label.authoring.heading  =Assessment Authoring
 label.author.title  =Assessment
-label.enter.question.title  =Enter question's title
-label.enter.question.description  =Enter question's description
+label.enter.question.title  =Question's title
+label.enter.question.description  =Question's description
 label.authoring.heading.basic  =Basic
 label.authoring.heading.basic.desc  =Basic input information for assessment tool
 label.authoring.heading.advance.desc  =Please input advance options for assessment tool
@@ -23,7 +23,7 @@
 label.authoring.basic.question.text  =Question text
 label.authoring.basic.default.question.grade  =Default question grade
 label.authoring.basic.penalty.factor  =Penalty factor
-label.authoring.basic.general.feedback  =Enter general feedback
+label.authoring.basic.general.feedback  =General feedback
 label.authoring.basic.shuffle.the.choices  =Shuffle answers?
 label.authoring.basic.add.question  =Add question
 label.authoring.basic.question.list.title  =Question list
@@ -56,9 +56,9 @@
 label.authoring.choice.one.answer  =One answer only
 label.authoring.choice.multiple.answers  =Multiple answers allowed
 label.authoring.choice.overall.feedback  =Overall feedback
-label.authoring.choice.feedback.on.correct  =Enter feedback shown on any correct response
-label.authoring.choice.feedback.on.partially.correct  =Enter feedback shown on any partially correct response
-label.authoring.choice.feedback.on.incorrect  =Enter feedback shown on any incorrect response
+label.authoring.choice.feedback.on.correct  =Feedback shown on any correct response
+label.authoring.choice.feedback.on.partially.correct  =Feedback shown on any partially correct response
+label.authoring.choice.feedback.on.incorrect  =Feedback shown on any incorrect response
 label.authoring.choice.add.option  =Add another answer
 label.authoring.matching.pairs.add.matching.pairs  =Add question
 label.authoring.matching.pairs.matching.pairs  =Matching pairs
@@ -74,8 +74,8 @@
 label.authoring.true.false.correct.answer  =Correct answer
 label.authoring.true.false.false  =False
 label.authoring.true.false.true  =True
-label.authoring.true.false.feedback.on.true  =Enter feedback for the response 'True'.
-label.authoring.true.false.feedback.on.false  =Enter feedback for the response 'False'.
+label.authoring.true.false.feedback.on.true  =Feedback for the response 'True'.
+label.authoring.true.false.feedback.on.false  =Feedback for the response 'False'.
 label.authoring.true.false.add.true.false  =Add question
 label.authoring.numerical.question  =Numerical question
 label.authoring.numerical.answers  =Answers
Index: lams_tool_assessment/web/includes/css/addQuestion.scss
===================================================================
diff -u -re9c2ee2d130911342b4c1311809cff6ea0da8ede -ra0aa698e675b0a2eb89e51cf645156ade0f93d64
--- lams_tool_assessment/web/includes/css/addQuestion.scss	(.../addQuestion.scss)	(revision e9c2ee2d130911342b4c1311809cff6ea0da8ede)
+++ lams_tool_assessment/web/includes/css/addQuestion.scss	(.../addQuestion.scss)	(revision a0aa698e675b0a2eb89e51cf645156ade0f93d64)
@@ -320,4 +320,66 @@
     top: -1rem;
     left: 0;
     font-size: .9rem;
+}
+
+/*----------SWITCH (https://www.w3schools.com/howto/howto_css_switch.asp)----------------*/
+
+.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%;
 }
\ No newline at end of file
Index: lams_tool_assessment/web/includes/css/bootstrap-toggle.scss
===================================================================
diff -u
--- lams_tool_assessment/web/includes/css/bootstrap-toggle.scss	(revision 0)
+++ lams_tool_assessment/web/includes/css/bootstrap-toggle.scss	(revision a0aa698e675b0a2eb89e51cf645156ade0f93d64)
@@ -0,0 +1,28 @@
+/*! ========================================================================
+ * Bootstrap Toggle: bootstrap-toggle.css v2.2.0
+ * http://www.bootstraptoggle.com
+ * ========================================================================
+ * Copyright 2014 Min Hur, The New York Times Company
+ * Licensed under MIT
+ * ======================================================================== */
+.checkbox label .toggle,.checkbox-inline .toggle{margin-left:-20px;margin-right:5px}
+.toggle{position:relative;overflow:hidden}
+.toggle input[type=checkbox]{display:none}
+.toggle-group{position:absolute;width:200%;top:0;bottom:0;left:0;transition:left .35s;-webkit-transition:left .35s;-moz-user-select:none;-webkit-user-select:none}
+.toggle.off .toggle-group{left:-100%}
+.toggle-on{position:absolute;top:0;bottom:0;left:0;right:50%;margin:0;border:0;border-radius:0}
+.toggle-off{position:absolute;top:0;bottom:0;left:50%;right:0;margin:0;border:0;border-radius:0}
+.toggle-handle{position:relative;margin:0 auto;padding-top:0;padding-bottom:0;height:100%;width:0;border-width:0 1px}
+.toggle.btn{min-width:59px;min-height:34px}
+.toggle-on.btn{padding-right:24px}
+.toggle-off.btn{padding-left:24px}
+.toggle.btn-lg{min-width:79px;min-height:45px}
+.toggle-on.btn-lg{padding-right:31px}
+.toggle-off.btn-lg{padding-left:31px}
+.toggle-handle.btn-lg{width:40px}
+.toggle.btn-sm{min-width:50px;min-height:30px}
+.toggle-on.btn-sm{padding-right:20px}
+.toggle-off.btn-sm{padding-left:20px}
+.toggle.btn-xs{min-width:35px;min-height:22px}
+.toggle-on.btn-xs{padding-right:12px}
+.toggle-off.btn-xs{padding-left:12px}
\ No newline at end of file
Index: lams_tool_assessment/web/includes/javascript/bootstrap-toggle.js
===================================================================
diff -u
--- lams_tool_assessment/web/includes/javascript/bootstrap-toggle.js	(revision 0)
+++ lams_tool_assessment/web/includes/javascript/bootstrap-toggle.js	(revision a0aa698e675b0a2eb89e51cf645156ade0f93d64)
@@ -0,0 +1,9 @@
+/*! ========================================================================
+ * Bootstrap Toggle: bootstrap-toggle.js v2.2.0
+ * http://www.bootstraptoggle.com
+ * ========================================================================
+ * Copyright 2014 Min Hur, The New York Times Company
+ * Licensed under MIT
+ * ======================================================================== */
++function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.toggle"),f="object"==typeof b&&b;e||d.data("bs.toggle",e=new c(this,f)),"string"==typeof b&&e[b]&&e[b]()})}var c=function(b,c){this.$element=a(b),this.options=a.extend({},this.defaults(),c),this.render()};c.VERSION="2.2.0",c.DEFAULTS={on:"On",off:"Off",onstyle:"primary",offstyle:"default",size:"normal",style:"",width:null,height:null},c.prototype.defaults=function(){return{on:this.$element.attr("data-on")||c.DEFAULTS.on,off:this.$element.attr("data-off")||c.DEFAULTS.off,onstyle:this.$element.attr("data-onstyle")||c.DEFAULTS.onstyle,offstyle:this.$element.attr("data-offstyle")||c.DEFAULTS.offstyle,size:this.$element.attr("data-size")||c.DEFAULTS.size,style:this.$element.attr("data-style")||c.DEFAULTS.style,width:this.$element.attr("data-width")||c.DEFAULTS.width,height:this.$element.attr("data-height")||c.DEFAULTS.height}},c.prototype.render=function(){this._onstyle="btn-"+this.options.onstyle,this._offstyle="btn-"+this.options.offstyle;var b="large"===this.options.size?"btn-lg":"small"===this.options.size?"btn-sm":"mini"===this.options.size?"btn-xs":"",c=a('<label class="btn">').html(this.options.on).addClass(this._onstyle+" "+b),d=a('<label class="btn">').html(this.options.off).addClass(this._offstyle+" "+b+" active"),e=a('<span class="toggle-handle btn btn-default">').addClass(b),f=a('<div class="toggle-group">').append(c,d,e),g=a('<div class="toggle btn" data-toggle="toggle">').addClass(this.$element.prop("checked")?this._onstyle:this._offstyle+" off").addClass(b).addClass(this.options.style);this.$element.wrap(g),a.extend(this,{$toggle:this.$element.parent(),$toggleOn:c,$toggleOff:d,$toggleGroup:f}),this.$toggle.append(f);var h=this.options.width||Math.max(c.outerWidth(),d.outerWidth())+e.outerWidth()/2,i=this.options.height||Math.max(c.outerHeight(),d.outerHeight());c.addClass("toggle-on"),d.addClass("toggle-off"),this.$toggle.css({width:h,height:i}),this.options.height&&(c.css("line-height",c.height()+"px"),d.css("line-height",d.height()+"px")),this.update(!0),this.trigger(!0)},c.prototype.toggle=function(){this.$element.prop("checked")?this.off():this.on()},c.prototype.on=function(a){return this.$element.prop("disabled")?!1:(this.$toggle.removeClass(this._offstyle+" off").addClass(this._onstyle),this.$element.prop("checked",!0),void(a||this.trigger()))},c.prototype.off=function(a){return this.$element.prop("disabled")?!1:(this.$toggle.removeClass(this._onstyle).addClass(this._offstyle+" off"),this.$element.prop("checked",!1),void(a||this.trigger()))},c.prototype.enable=function(){this.$toggle.removeAttr("disabled"),this.$element.prop("disabled",!1)},c.prototype.disable=function(){this.$toggle.attr("disabled","disabled"),this.$element.prop("disabled",!0)},c.prototype.update=function(a){this.$element.prop("disabled")?this.disable():this.enable(),this.$element.prop("checked")?this.on(a):this.off(a)},c.prototype.trigger=function(b){this.$element.off("change.bs.toggle"),b||this.$element.change(),this.$element.on("change.bs.toggle",a.proxy(function(){this.update()},this))},c.prototype.destroy=function(){this.$element.off("change.bs.toggle"),this.$toggleGroup.remove(),this.$element.removeData("bs.toggle"),this.$element.unwrap()};var d=a.fn.bootstrapToggle;a.fn.bootstrapToggle=b,a.fn.bootstrapToggle.Constructor=c,a.fn.toggle.noConflict=function(){return a.fn.bootstrapToggle=d,this},a(function(){a("input[type=checkbox][data-toggle^=toggle]").bootstrapToggle()}),a(document).on("click.bs.toggle","div[data-toggle^=toggle]",function(b){var c=a(this).find("input[type=checkbox]");c.bootstrapToggle("toggle"),b.preventDefault()})}(jQuery);
+//# sourceMappingURL=bootstrap-toggle.min.js.map
\ No newline at end of file
Index: lams_tool_assessment/web/pages/authoring/parts/addessay.jsp
===================================================================
diff -u -r78ae88b9a7c79f31eb1f795d084be7d283963885 -ra0aa698e675b0a2eb89e51cf645156ade0f93d64
--- lams_tool_assessment/web/pages/authoring/parts/addessay.jsp	(.../addessay.jsp)	(revision 78ae88b9a7c79f31eb1f795d084be7d283963885)
+++ lams_tool_assessment/web/pages/authoring/parts/addessay.jsp	(.../addessay.jsp)	(revision a0aa698e675b0a2eb89e51cf645156ade0f93d64)
@@ -139,15 +139,18 @@
 				</div>
 				
 				<div class="settings-tab">
-					 <div class="error">
+					<div class="error">
 				    	<lams:Alert id="errorMessages" type="danger" close="false" >
 							<span></span>
 						</lams:Alert>	
 				    </div>
 				    
-					<div class="checkbox">
-						<label for="answer-required">
+					<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>
 					</div>
@@ -164,10 +167,13 @@
 						    </div>
 						</div>
 					</c:if>
-					
-					<div class="checkbox">
-						<label for="allow-rich-editor">
+
+					<div>
+						<label class="switch">
 							<form:checkbox path="allowRichEditor" id="allow-rich-editor"/>
+							<span class="switch-slider round"></span>
+						</label>
+						<label for="allow-rich-editor">		
 							<fmt:message key="label.authoring.basic.allow.learners.rich.editor" />
 						</label>
 					</div>
Index: lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp
===================================================================
diff -u -r78ae88b9a7c79f31eb1f795d084be7d283963885 -ra0aa698e675b0a2eb89e51cf645156ade0f93d64
--- lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision 78ae88b9a7c79f31eb1f795d084be7d283963885)
+++ lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision a0aa698e675b0a2eb89e51cf645156ade0f93d64)
@@ -5,72 +5,12 @@
 <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>
+	<link href="<lams:WebAppURL/>includes/css/bootstrap-toggle.css" rel="stylesheet" type="text/css">
+	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/bootstrap-toggle.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%;
-}
-	
+	.toggle.btn-xs {
+		min-width: 59px;
+	}
 	</style>
 	
     <script>
@@ -119,7 +59,14 @@
 		    		    				
 		    		$('#assessmentQuestionForm').ajaxSubmit(options);
 		    	}
-		  	});    	
+		  	});
+
+		    //enforce only one correct option
+		    $(document).on("change", "input[type='checkbox'][name='optionCorrect']", function() {
+		        if(this.checked) {
+		        	$("input[type='checkbox'][name='optionCorrect']").not(this).bootstrapToggle('off');
+		        }
+		    });	
 		});   
  	</script>
 </lams:head>
Index: lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp
===================================================================
diff -u -r78ae88b9a7c79f31eb1f795d084be7d283963885 -ra0aa698e675b0a2eb89e51cf645156ade0f93d64
--- lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision 78ae88b9a7c79f31eb1f795d084be7d283963885)
+++ lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision a0aa698e675b0a2eb89e51cf645156ade0f93d64)
@@ -112,9 +112,12 @@
 						</lams:Alert>	
 				    </div>
 				
-					<div class="checkbox">
-						<label for="answer-required">
+					<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>
 					</div>
@@ -143,9 +146,12 @@
 					    </div>
 					</div>
 	
-					<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>
Index: lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp
===================================================================
diff -u -r78ae88b9a7c79f31eb1f795d084be7d283963885 -ra0aa698e675b0a2eb89e51cf645156ade0f93d64
--- lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision 78ae88b9a7c79f31eb1f795d084be7d283963885)
+++ lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision a0aa698e675b0a2eb89e51cf645156ade0f93d64)
@@ -158,9 +158,12 @@
 						</lams:Alert>	
 				    </div>
 				
-					<div class="checkbox">
-						<label for="answer-required">
+					<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>
 					</div>
@@ -201,24 +204,33 @@
 							</form:select>
 						</div>
 					</div>
-					
-					<div class="checkbox" id="incorrect-answer-nullifies-mark-area">
-						<label for="incorrectAnswerNullifiesMark">
+
+					<div id="incorrect-answer-nullifies-mark-area">
+						<label class="switch">
 							<form:checkbox path="incorrectAnswerNullifiesMark" id="incorrectAnswerNullifiesMark"/>
+							<span class="switch-slider round"></span>
+						</label>
+						<label for="incorrectAnswerNullifiesMark">		
 							<fmt:message key="label.incorrect.answer.nullifies.mark" />
 						</label>
-					</div>		
+					</div>
 		
-					<div class="checkbox">
-						<label for="shuffle">
+					<div>
+						<label class="switch">
 							<form:checkbox path="shuffle" id="shuffle"/>
-							<span id="shuffleText"><fmt:message key="label.authoring.basic.shuffle.the.choices" /></span>
+							<span class="switch-slider round"></span>
 						</label>
+						<label for="shuffle">		
+							<fmt:message key="label.authoring.basic.shuffle.the.choices" />
+						</label>
 					</div>
-					
-					<div class="checkbox" id="prefixAnswersWithLettersDiv">
-						<label for="prefixAnswersWithLetters">
+
+					<div id="prefixAnswersWithLettersDiv">
+						<label class="switch">
 							<form:checkbox path="prefixAnswersWithLetters" id="prefixAnswersWithLetters"/>
+							<span class="switch-slider round"></span>
+						</label>
+						<label for="prefixAnswersWithLetters">		
 							<span id="prefixAnswersWithLettersText"><fmt:message key="label.prefix.sequential.letters.for.each.answer" /></span>
 						</label>
 					</div>
Index: lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp
===================================================================
diff -u -r78ae88b9a7c79f31eb1f795d084be7d283963885 -ra0aa698e675b0a2eb89e51cf645156ade0f93d64
--- lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	(.../addnumerical.jsp)	(revision 78ae88b9a7c79f31eb1f795d084be7d283963885)
+++ lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	(.../addnumerical.jsp)	(revision a0aa698e675b0a2eb89e51cf645156ade0f93d64)
@@ -171,9 +171,12 @@
 						</lams:Alert>	
 				    </div>
 				    
-					<div class="checkbox">
-						<label for="answer-required">
+					<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>
 					</div>
Index: lams_tool_assessment/web/pages/authoring/parts/addordering.jsp
===================================================================
diff -u -r78ae88b9a7c79f31eb1f795d084be7d283963885 -ra0aa698e675b0a2eb89e51cf645156ade0f93d64
--- lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	(.../addordering.jsp)	(revision 78ae88b9a7c79f31eb1f795d084be7d283963885)
+++ lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	(.../addordering.jsp)	(revision a0aa698e675b0a2eb89e51cf645156ade0f93d64)
@@ -111,9 +111,12 @@
 						</lams:Alert>	
 				    </div>
 				
-					<div class="checkbox">
-						<label for="answer-required">
+					<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>
 					</div>
Index: lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp
===================================================================
diff -u -r78ae88b9a7c79f31eb1f795d084be7d283963885 -ra0aa698e675b0a2eb89e51cf645156ade0f93d64
--- lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision 78ae88b9a7c79f31eb1f795d084be7d283963885)
+++ lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision a0aa698e675b0a2eb89e51cf645156ade0f93d64)
@@ -119,12 +119,15 @@
 						</lams:Alert>	
 				    </div>
 				
-					<div class="checkbox">
-						<label for="answer-required">
+					<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>
-					</div>
+					</div>>
 					
 					<c:if test="${!isAuthoringRestricted}">
 						<div class="form-group row form-inline">
Index: lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp
===================================================================
diff -u -r78ae88b9a7c79f31eb1f795d084be7d283963885 -ra0aa698e675b0a2eb89e51cf645156ade0f93d64
--- lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision 78ae88b9a7c79f31eb1f795d084be7d283963885)
+++ lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision a0aa698e675b0a2eb89e51cf645156ade0f93d64)
@@ -116,12 +116,15 @@
 						</lams:Alert>	
 				    </div>
 				
-					<div class="checkbox">
-						<label for="answer-required">
+					<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>
-					</div>				
+					</div>			
 					
 					<c:if test="${!isAuthoringRestricted}">
 						<div class="form-group row form-inline">
Index: lams_tool_assessment/web/pages/authoring/parts/optionhedgingmark.jsp
===================================================================
diff -u -re9c2ee2d130911342b4c1311809cff6ea0da8ede -ra0aa698e675b0a2eb89e51cf645156ade0f93d64
--- lams_tool_assessment/web/pages/authoring/parts/optionhedgingmark.jsp	(.../optionhedgingmark.jsp)	(revision e9c2ee2d130911342b4c1311809cff6ea0da8ede)
+++ lams_tool_assessment/web/pages/authoring/parts/optionhedgingmark.jsp	(.../optionhedgingmark.jsp)	(revision a0aa698e675b0a2eb89e51cf645156ade0f93d64)
@@ -10,7 +10,8 @@
 <div class="option-settings-hidden" style="display: none;">
 
 	<div class="voffset10-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"
+		<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>
 				
Index: lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp
===================================================================
diff -u -re9c2ee2d130911342b4c1311809cff6ea0da8ede -ra0aa698e675b0a2eb89e51cf645156ade0f93d64
--- lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp	(.../optionlist.jsp)	(revision e9c2ee2d130911342b4c1311809cff6ea0da8ede)
+++ lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp	(.../optionlist.jsp)	(revision a0aa698e675b0a2eb89e51cf645156ade0f93d64)
@@ -1,28 +1,7 @@
 <%@ include file="/common/taglibs.jsp"%>
+
 <script type="text/javascript">
 	$(document).ready(function(){
-		/*
-		var focusingOutSemaphor = false;
-		$("#option-table-0x").focusin(function(event) {
-			focusingOutSemaphor = false;
-			$(".option-feedback", this).slideDown("slow");
-			console.log("focusin" + event);
-		});
-
-		$("#option-table-0x").focusout(function(event) {
-			focusingOutSemaphor = true;
-			setTimeout(
-				function(){ 
-					//if (focusingOutSemaphor) {
-						$(".option-feedback", $("#option-table-0")).slideUp("slow");
-						console.log("focusout" + event.target.outerHTML);
-					//}
-				}, 
-				500
-			);
-		});
-		*/
-
 		CKEDITOR.on('instanceLoaded', function(e){
 			//apply to only option title CKEditors
 			var id = e.editor.element.$.id;
@@ -51,57 +30,6 @@
 
 					expandedTable = tableId;
 			    } );
-
-/*			    e.editor.on( 'blurx', function() {
-					focusingOutSemaphor = true;
-					setTimeout(
-						function(){ 
-							if (focusingOutSemaphor) {
-								var tableId = id.replace("optionString", "option-table-");
-								$(".option-feedback", $("#" + tableId)).slideUp("slow");
-								console.log("focusout");
-							}
-						}, 
-						500
-					);
-
-					//console.log(e.editor.focusManager); 
-			    } ); 
-
-				e.editor.editable().on('focusx', function (event) {
-					var tableId = id.replace("optionString", "option-table-");
-					$(".option-feedback", $("#" + tableId)).slideDown("slow");
-					//.removeClass("hidden", 3000);
-				});
-
-				e.editor.editable().on('blurx', function (event) {
-					var tableId = id.replace("optionString", "option-table-");
-					$(".option-feedback", $("#" + tableId)).slideUp("slow", function() {
-						console.log("e.editor.editable().on('blur");
-					   // $(this).addClass("hidden");
-					});
-				});
-
-				e.editor.editable().on('activex', function (event) {
-				});
-				
-				e.editor.on( 'contentDom', function() {
-					console.log('contentDom');
-				    this.document.on('click', function(event){
-				    	console.log('Click Event');
-				    });
-
-				    this.document.on('blur', function(event){
-				    	console.log("doc blur");
-				    });
-
-					
-				    var editable = e.editor.editable();
-				    editable.attachListener( editable, 'click', function() {
-				    	console.log('contentDom2');
-				    });
-				});
-*/
 			}
 		});
 
@@ -134,6 +62,9 @@
 		    	closeExpandedAreas();
 		    }
 		});
+
+		//init all toogles (required in case of adding/removing options)
+		$("input[type='checkbox'][name='optionCorrect']").bootstrapToggle();
 	});
 
 	//store which table is expanded
@@ -143,7 +74,6 @@
 		$(".option-settings-hidden").slideUp();
 		expandedTable = "";
 	}
-	 
 </script>
 
 <div id="optionArea">