Index: lams_central/web/ckeditor/plugins/confighelper/plugin.js
===================================================================
diff -u -rc2dd5ccedb6cfa8bb4df16752c99c2c2d13478a0 -r78ae88b9a7c79f31eb1f795d084be7d283963885
--- lams_central/web/ckeditor/plugins/confighelper/plugin.js	(.../plugin.js)	(revision c2dd5ccedb6cfa8bb4df16752c99c2c2d13478a0)
+++ lams_central/web/ckeditor/plugins/confighelper/plugin.js	(.../plugin.js)	(revision 78ae88b9a7c79f31eb1f795d084be7d283963885)
@@ -176,6 +176,7 @@
 				editor.on('mode', addPlaceholder, null, placeholder);
 				editor.on('contentDom', addPlaceholder, null, placeholder);
 
+				//**LAMS** commented out the following line
 				editor.on('focus', removePlaceholder);
 				editor.on('key', removePlaceholder);
 				editor.on('beforeModeUnload', removePlaceholder);
Index: lams_central/web/includes/javascript/ckconfig_custom.js
===================================================================
diff -u -ra6c94a5454507a7c6502caf4c054000f36cc6778 -r78ae88b9a7c79f31eb1f795d084be7d283963885
--- lams_central/web/includes/javascript/ckconfig_custom.js	(.../ckconfig_custom.js)	(revision a6c94a5454507a7c6502caf4c054000f36cc6778)
+++ lams_central/web/includes/javascript/ckconfig_custom.js	(.../ckconfig_custom.js)	(revision 78ae88b9a7c79f31eb1f795d084be7d283963885)
@@ -146,15 +146,19 @@
 
 // Hides editor instaces until they are fully initialized
 CKEDITOR.on('instanceCreated', function(e){
-	e.editor.element.$.style.display = 'none';
+	//e.editor.element.$.style.display = 'none';
 });
 
 CKEDITOR.on('instanceReady', function(e){
 	
 	//add custom classes
 	var classes = e.editor.config.classes;
 	if (classes) {
-		e.editor._.editable.$.classList.add(classes);
+		for (classIter of classes.split(' ')) {
+			if (classIter) {
+				e.editor._.editable.$.classList.add(classIter);
+			}
+	    }
 	}
 	
 	var height = e.editor.config.height;
@@ -180,4 +184,16 @@
 		
 		f.data.dataValue = tempDiv.innerHTML;
 	});
+	
+	//add cke_filled class, when editor gets filled
+	e.editor.on('change', function(event) {
+		var ckeditorData = event.editor.getData();
+		
+		var isEmpty = (ckeditorData == null) || (ckeditorData.replace(/&nbsp;| |<br \/>|\s|<p>|<\/p>|\xa0/g, "").length == 0);
+		if (isEmpty) {
+			event.editor._.editable.$.classList.remove("cke_filled");
+		} else {
+			event.editor._.editable.$.classList.add("cke_filled");
+		}
+	});
 });
Index: lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r8a65083cf102509e0ca486f636746f56a600c514 -r78ae88b9a7c79f31eb1f795d084be7d283963885
--- lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
+++ lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 78ae88b9a7c79f31eb1f795d084be7d283963885)
@@ -6,6 +6,7 @@
 <%@ attribute name="placeholder" required="false" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="classes" required="false" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
@@ -40,8 +41,18 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
+<c:if test="${not empty placeholder}">
+	<c:set var="classes" value="placeholder-shown ${classes}" />
+	<div class="cke-div">
+</c:if>
 
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+
+<c:if test="${not empty placeholder}">
+		<label for="${id}" class="cke-label-floating">${placeholder}</label>
+	</div>
+</c:if>
+
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
@@ -70,6 +81,7 @@
 				width                         : "${width}",
 				height                        : "${height}",
 				toolbar                       : "${toolbarSet}",
+				classes                       : "${classes}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
Index: lams_tool_assessment/web/includes/css/addQuestion.scss
===================================================================
diff -u -r8da56e9b473a1e97a58043ebaec2c4cadb7d5129 -r78ae88b9a7c79f31eb1f795d084be7d283963885
--- lams_tool_assessment/web/includes/css/addQuestion.scss	(.../addQuestion.scss)	(revision 8da56e9b473a1e97a58043ebaec2c4cadb7d5129)
+++ lams_tool_assessment/web/includes/css/addQuestion.scss	(.../addQuestion.scss)	(revision 78ae88b9a7c79f31eb1f795d084be7d283963885)
@@ -17,7 +17,7 @@
 	padding-left: 0;
 }
 .short-input-text {
-	width:10% !important;
+	max-width: 100px;
 }
 
 #max-words-limit-checkbox, #min-words-limit-checkbox {
@@ -37,8 +37,17 @@
 #hasOptionFilled-error {
 	display: table;
 }
+i.fa-asterisk.text-danger {
+	vertical-align: super;
+}
 
 /* overwriting bootstrap values */
+.checkbox + .checkbox, .radio + .radio {
+	margin-top: 0;
+}
+.checkbox, .radio {
+    margin-bottom: 15px;
+}
 .panel {
 	margin-bottom: 0 !important;
 }
@@ -133,14 +142,6 @@
 	visibility:visible;
 }
 
-/* hover effect for options area */
-.delete-button, .settings-on-hover-hidden{
-	visibility:hidden;
-}	
-#option-table.hover-active tr:hover .delete-button, #option-table.hover-active tr:hover .settings-on-hover-hidden {
-	visibility:visible;
-}
-
 /* Overwrite default CKEditor style */
 div[contenteditable] {
     display: block;
@@ -220,11 +221,12 @@
 /*----------SLIDER----------------*/
 
 .ui-widget-content.ui-slider {
-	border: 0.03em solid #bdc3c7;
+	border: 0.02em solid #bdc3c7;
 	background: #e1e1e1;
 	color: #222222;
-	margin-top: -0.03em;
+	margin-top: -0.02em;
 	padding: 0.08em;
+	opacity:0.8;
 }
 
 .ui-state-default, .ui-widget-content.ui-slider .ui-state-default{
@@ -287,4 +289,32 @@
 .grade-slider>div:first-child {
 	margin-top: -7px;
 	padding: 0;
+}
+
+/*----------CKEDITOR FLOATING LABEL----------------*/
+
+.cke-div {
+    position: relative;
+}
+
+/*
+div[contenteditable].placeholder-shown {
+	margin-top: 22px;
+}*/
+
+.cke-label-floating {
+    will-change: left,top,contents;
+    margin: 0;
+    line-height: 1.4;
+    font-weight: 400;
+    position: absolute;
+    pointer-events: none;
+    transition: all .3s ease;
+    color: #999 !important;
+    top: 0;
+}
+div[contenteditable]:focus + .cke-label-floating, div[contenteditable].cke_filled + .cke-label-floating {
+    top: -1rem;
+    left: 0;
+    font-size: .9rem;
 }
\ No newline at end of file
Index: lams_tool_assessment/web/includes/css/assessment.scss
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r78ae88b9a7c79f31eb1f795d084be7d283963885
--- lams_tool_assessment/web/includes/css/assessment.scss	(.../assessment.scss)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_assessment/web/includes/css/assessment.scss	(.../assessment.scss)	(revision 78ae88b9a7c79f31eb1f795d084be7d283963885)
@@ -1,10 +1,5 @@
 @import "_lams_variables.scss";
 
-#overall-feedback {
-	margin-left: 23px; 
-	margin-top: 10px;
-}
-
 .innerforms {
 	border: 0px;
 	font-size: small;
Index: lams_tool_assessment/web/includes/javascript/authoring-options.js
===================================================================
diff -u -r8a65083cf102509e0ca486f636746f56a600c514 -r78ae88b9a7c79f31eb1f795d084be7d283963885
--- lams_tool_assessment/web/includes/javascript/authoring-options.js	(.../authoring-options.js)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
+++ lams_tool_assessment/web/includes/javascript/authoring-options.js	(.../authoring-options.js)	(revision 78ae88b9a7c79f31eb1f795d084be7d283963885)
@@ -60,7 +60,6 @@
 }
 
 function initializeAnswers() {
-	
 
 	//check if jquery-ui.slider.js library is loaded
 	if (typeof(jQuery.ui.slider) != 'undefined'){
@@ -112,14 +111,14 @@
 	    direction: 'vertical',
 		onStart: function (evt) {
 			//stop answers' hover effect, once element dragging started
-			$("#option-table").removeClass("hover-active");
+			//$("#option-table").removeClass("hover-active");
 		},
 		onEnd: function (evt) {
 			//activate answers' hover effect, once element dragging ended
-			$("#option-table").delay(50).queue(function(next){
-			    $(this).addClass("hover-active");
-			    next();
-			});
+			//$("#option-table").delay(50).queue(function(next){
+			//    $(this).addClass("hover-active");
+			//    next();
+			//});
 		},
 		store: {
 			set: function (sortable) {
Index: lams_tool_assessment/web/pages/authoring/parts/addessay.jsp
===================================================================
diff -u -r8da56e9b473a1e97a58043ebaec2c4cadb7d5129 -r78ae88b9a7c79f31eb1f795d084be7d283963885
--- lams_tool_assessment/web/pages/authoring/parts/addessay.jsp	(.../addessay.jsp)	(revision 8da56e9b473a1e97a58043ebaec2c4cadb7d5129)
+++ lams_tool_assessment/web/pages/authoring/parts/addessay.jsp	(.../addessay.jsp)	(revision 78ae88b9a7c79f31eb1f795d084be7d283963885)
@@ -131,7 +131,7 @@
 					    	placeholder="${TITLE_LABEL}"/>
 					</div>
 				
-					<div class="form-group">
+					<div class="form-group form-group-cke">
 						<c:set var="QUESTION_DESCRIPTION_LABEL"><fmt:message key="label.enter.question.description"/></c:set>
 						<lams:CKEditor id="question" value="${assessmentQuestionForm.question}" contentFolderID="${assessmentQuestionForm.contentFolderID}" 
 							placeholder="${QUESTION_DESCRIPTION_LABEL}"	 />
@@ -153,12 +153,15 @@
 					</div>
 	
 					<c:if test="${!isAuthoringRestricted}">
-						<div class="form-group form-inline">
-						    <label for="defaultGrade">
-						    	<fmt:message key="label.authoring.basic.default.question.grade" />:
-						    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+						<div class="form-group row form-inline">
+						    <label for="defaultGrade" class="col-sm-3">
+						    	<fmt:message key="label.authoring.basic.default.question.grade" />
+						    	<i class="fa fa-xs fa-asterisk text-danger" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 						    </label>
-						    <form:input path="defaultGrade" cssClass="form-control short-input-text input-sm"/>
+						    
+						    <div class="col-sm-9">
+						    	<form:input path="defaultGrade" cssClass="form-control short-input-text input-sm"/>
+						    </div>
 						</div>
 					</c:if>
 					
@@ -169,24 +172,30 @@
 						</label>
 					</div>
 					
-					<div class="checkbox">
-					    <label for="max-words-limit-checkbox">
+					<div class="form-group row form-inline" style="display: flex; align-items: center;">
+					    <label for="max-words-limit-checkbox" class="col-sm-3">
 							<input type="checkbox" id="max-words-limit-checkbox" name="noname"
 								<c:if test="${assessmentQuestionForm.maxWordsLimit != 0}">checked="checked"</c:if>/>
 					    	<fmt:message key="label.maximum.number.words" />
 					    </label>
-					    <form:input path="maxWordsLimit" id="max-words-limit"/>
-					    <label id="max-words-limit-error" class="alert alert-danger" for="max-words-limit" style="display: none;"></label>
+					    
+					    <div class="col-sm-9">
+					   		<form:input path="maxWordsLimit" id="max-words-limit"/>
+					    	<label id="max-words-limit-error" class="alert alert-danger" for="max-words-limit" style="display: none;"></label>
+					    </div>
 					</div>
 					
-					<div class="checkbox">
-					    <label for="min-words-limit-checkbox">
+					<div class="form-group row form-inline" style="display: flex; align-items: center;">
+					    <label for="min-words-limit-checkbox" class="col-sm-3">
 							<input type="checkbox" id="min-words-limit-checkbox" name="noname"
 								<c:if test="${assessmentQuestionForm.minWordsLimit != 0}">checked="checked"</c:if>/>
 					    	<fmt:message key="label.minimum.number.words" />
 					    </label>
-					    <form:input path="minWordsLimit" id="min-words-limit"/>
-					    <label id="min-words-limit-error" class="alert alert-danger" for="min-words-limit" style="display: none;"></label>
+					    
+					    <div class="col-sm-9">
+					    	<form:input path="minWordsLimit" id="min-words-limit"/>
+					    	<label id="min-words-limit-error" class="alert alert-danger" for="min-words-limit" style="display: none;"></label>
+					    </div>
 					</div>
 	
 					<div class="voffset5 form-group">
Index: lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp
===================================================================
diff -u -rba5d276f1fd9c153812980bf28ce318b714a664b -r78ae88b9a7c79f31eb1f795d084be7d283963885
--- lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision ba5d276f1fd9c153812980bf28ce318b714a664b)
+++ lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision 78ae88b9a7c79f31eb1f795d084be7d283963885)
@@ -183,12 +183,15 @@
 					</label>
 	
 					<c:if test="${!isAuthoringRestricted}">
-						<div class="form-group form-inline">
-						    <label for="defaultGrade">
-						    	<fmt:message key="label.authoring.basic.default.question.grade" />:
-						    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+						<div class="form-group row form-inline">
+						    <label for="defaultGrade" class="col-sm-3">
+						    	<fmt:message key="label.authoring.basic.default.question.grade" />
+						    	<i class="fa fa-xs fa-asterisk text-danger" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 						    </label>
-						    <form:input path="defaultGrade" cssClass="form-control short-input-text input-sm"/>
+						    
+						    <div class="col-sm-9">
+						    	<form:input path="defaultGrade" cssClass="form-control short-input-text input-sm"/>
+						    </div>
 						</div>
 					</c:if>
 					
Index: lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp
===================================================================
diff -u -rba5d276f1fd9c153812980bf28ce318b714a664b -r78ae88b9a7c79f31eb1f795d084be7d283963885
--- lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision ba5d276f1fd9c153812980bf28ce318b714a664b)
+++ lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision 78ae88b9a7c79f31eb1f795d084be7d283963885)
@@ -119,20 +119,28 @@
 						</label>
 					</div>
 	
-					<div class="form-group form-inline">
-						<c:if test="${!isAuthoringRestricted}">
-						    <label for="defaultGrade">
-						    	<fmt:message key="label.authoring.basic.default.question.grade" />:
-						    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+					<c:if test="${!isAuthoringRestricted}">
+						<div class="form-group row form-inline">
+						    <label for="defaultGrade" class="col-sm-3">
+						    	<fmt:message key="label.authoring.basic.default.question.grade" />
+						    	<i class="fa fa-xs fa-asterisk text-danger" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 						    </label>
-						    <form:input path="defaultGrade" cssClass="form-control short-input-text input-sm"/>
-					    </c:if>
-					    
-					    <label class="loffset10" for="penaltyFactor"> 
-					    	<fmt:message key="label.authoring.basic.penalty.factor" />:
-							  <i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+						    
+						    <div class="col-sm-9">
+						    	<form:input path="defaultGrade" cssClass="form-control short-input-text input-sm"/>
+						    </div>
+						</div>
+					</c:if>
+					
+					<div class="form-group row form-inline">
+					    <label for="penaltyFactor" class="col-sm-3"> 
+					    	<fmt:message key="label.authoring.basic.penalty.factor" />
+							  <i class="fa fa-xs fa-asterisk text-danger" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 					    </label>
-					    <form:input path="penaltyFactor" cssClass="form-control short-input-text input-sm"/>
+					    
+					    <div class="col-sm-9">
+					    	<form:input path="penaltyFactor" cssClass="form-control short-input-text input-sm"/>
+					    </div>
 					</div>
 	
 					<div class="checkbox">
Index: lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp
===================================================================
diff -u -rba5d276f1fd9c153812980bf28ce318b714a664b -r78ae88b9a7c79f31eb1f795d084be7d283963885
--- lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision ba5d276f1fd9c153812980bf28ce318b714a664b)
+++ lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision 78ae88b9a7c79f31eb1f795d084be7d283963885)
@@ -165,32 +165,41 @@
 						</label>
 					</div>
 					
-					<div class="form-group form-inline">
-						<c:if test="${!isAuthoringRestricted}">
-						    <label for="defaultGrade">
-						    	<fmt:message key="label.authoring.basic.default.question.grade" />:
-						    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+					<c:if test="${!isAuthoringRestricted}">
+						<div class="form-group row">
+						    <label for="defaultGrade" class="col-sm-3">
+						    	<fmt:message key="label.authoring.basic.default.question.grade" />
+						    	<i class="fa fa-xs fa-asterisk text-danger" style="vertical-align: super;" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 						    </label>
-						    <form:input path="defaultGrade" cssClass="form-control short-input-text input-sm"/>
-					    </c:if>
-					</div>
-					
-					<div class="form-group form-inline">
-					    <label for="penaltyFactor"> 
-					    	<fmt:message key="label.authoring.basic.penalty.factor" />:
-							  <i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+						    
+						    <div class="col-sm-9">
+						    	<form:input path="defaultGrade" cssClass="form-control short-input-text input-sm"/>
+						    </div>
+						</div>
+					</c:if>
+					    					
+					<div class="form-group row">
+					    <label for="penaltyFactor" class="col-sm-3"> 
+					    	<fmt:message key="label.authoring.basic.penalty.factor" />
+							<i class="fa fa-xs fa-asterisk text-danger" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 					    </label>
-					    <form:input path="penaltyFactor" cssClass="form-control short-input-text input-sm"/>
+					    
+					    <div class="col-sm-9">
+					    	<form:input path="penaltyFactor" cssClass="form-control short-input-text input-sm"/>
+					    </div>
 					</div>
 					
-					<div class="form-inline form-group">
-						<label for="multipleAnswersAllowed">
+					<div class="form-group row form-inline">
+						<label for="multipleAnswersAllowed" class="col-sm-3">
 							<fmt:message key="label.authoring.choice.one.multiple.answers" />
 						</label>
-						<form:select path="multipleAnswersAllowed" id="multipleAnswersAllowed" cssClass="form-control input-sm">
-							<form:option value="false"><fmt:message key="label.authoring.choice.one.answer" /></form:option>
-							<form:option value="true"><fmt:message key="label.authoring.choice.multiple.answers" /></form:option>
-						</form:select>
+						
+						<div class="col-sm-9">
+							<form:select path="multipleAnswersAllowed" id="multipleAnswersAllowed" cssClass="form-control input-sm">
+								<form:option value="false"><fmt:message key="label.authoring.choice.one.answer" /></form:option>
+								<form:option value="true"><fmt:message key="label.authoring.choice.multiple.answers" /></form:option>
+							</form:select>
+						</div>
 					</div>
 					
 					<div class="checkbox" id="incorrect-answer-nullifies-mark-area">
@@ -213,36 +222,32 @@
 							<span id="prefixAnswersWithLettersText"><fmt:message key="label.prefix.sequential.letters.for.each.answer" /></span>
 						</label>
 					</div>
+				
+					<!-- Overall feedback -->
+					<!-- <h5 style="margin-top: 20px;">Feedbacks</h5> -->
 	
-					<div class="voffset5 form-group">
-						<c:set var="GENERAL_FEEDBACK_LABEL"><fmt:message key="label.authoring.basic.general.feedback"/></c:set>
+					<div class="form-group">
+						<c:set var="GENERAL_FEEDBACK_LABEL">General Feedback</c:set>
 						<lams:CKEditor id="generalFeedback" value="${assessmentQuestionForm.generalFeedback}" 
 							placeholder="${GENERAL_FEEDBACK_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
 					</div>
-				
-					<!-- Overall feedback -->
-					<div class="overallFeedback">
-					  <fmt:message key="label.authoring.choice.overall.feedback" />
-		
-						<div id="overall-feedback">				
-							<div class="form-group">
-								<c:set var="FEEDBACK_ON_CORRECT_LABEL"><fmt:message key="label.authoring.choice.feedback.on.correct"/></c:set>
-								<lams:CKEditor id="feedbackOnCorrect" value="${assessmentQuestionForm.feedbackOnCorrect}" 
-									placeholder="${FEEDBACK_ON_CORRECT_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
-							</div>
+					
+					<div class="form-group">
+						<c:set var="FEEDBACK_ON_CORRECT_LABEL">Feedback on any correct response</c:set>
+						<lams:CKEditor id="feedbackOnCorrect" value="${assessmentQuestionForm.feedbackOnCorrect}" 
+							placeholder="${FEEDBACK_ON_CORRECT_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
+					</div>
+					
+					<div class="form-group">
+						<c:set var="FEEDBACK_ON_PARTICALLY_CORRECT_LABEL">Feedback on any partially correct response</c:set>
+						<lams:CKEditor id="feedbackOnPartiallyCorrect" value="${assessmentQuestionForm.feedbackOnPartiallyCorrect}" 
+							placeholder="${FEEDBACK_ON_PARTICALLY_CORRECT_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
+					</div>
 							
-							<div class="form-group">
-								<c:set var="FEEDBACK_ON_PARTICALLY_CORRECT_LABEL"><fmt:message key="label.authoring.choice.feedback.on.partially.correct" /></c:set>
-								<lams:CKEditor id="feedbackOnPartiallyCorrect" value="${assessmentQuestionForm.feedbackOnPartiallyCorrect}" 
-									placeholder="${FEEDBACK_ON_PARTICALLY_CORRECT_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
-							</div>
-							
-							<div class="form-group">
-								<c:set var="FEEDBACK_ON_INCORRECT_LABEL"><fmt:message key="label.authoring.choice.feedback.on.incorrect" /></c:set>
-								<lams:CKEditor id="feedbackOnIncorrect" value="${assessmentQuestionForm.feedbackOnIncorrect}" 
-									placeholder="${FEEDBACK_ON_INCORRECT_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
-							</div>
-						</div>
+					<div class="form-group">
+						<c:set var="FEEDBACK_ON_INCORRECT_LABEL">Feedback on any incorrect response</c:set>
+						<lams:CKEditor id="feedbackOnIncorrect" value="${assessmentQuestionForm.feedbackOnIncorrect}" 
+							placeholder="${FEEDBACK_ON_INCORRECT_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
 					</div>
 				</div><!-- settings tab ends -->
 			</form:form>
Index: lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp
===================================================================
diff -u -rba5d276f1fd9c153812980bf28ce318b714a664b -r78ae88b9a7c79f31eb1f795d084be7d283963885
--- lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	(.../addnumerical.jsp)	(revision ba5d276f1fd9c153812980bf28ce318b714a664b)
+++ lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	(.../addnumerical.jsp)	(revision 78ae88b9a7c79f31eb1f795d084be7d283963885)
@@ -178,20 +178,28 @@
 						</label>
 					</div>
 					
-					<div class="form-group form-inline">
-						<c:if test="${!isAuthoringRestricted}">
-						    <label for="defaultGrade">
-						    	<fmt:message key="label.authoring.basic.default.question.grade" />:
-						    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+					<c:if test="${!isAuthoringRestricted}">
+						<div class="form-group row form-inline">
+						    <label for="defaultGrade" class="col-sm-3">
+						    	<fmt:message key="label.authoring.basic.default.question.grade" />
+						    	<i class="fa fa-xs fa-asterisk text-danger" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 						    </label>
-						    <form:input path="defaultGrade" cssClass="number form-control short-input-text input-sm"/>
-					    </c:if>
-	
-					    <label class="loffset10" for="penaltyFactor"> 
-					    	<fmt:message key="label.authoring.basic.penalty.factor" />: 
-							  <i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+						    
+						    <div class="col-sm-9">
+						    	<form:input path="defaultGrade" cssClass="form-control short-input-text input-sm"/>
+						    </div>
+						</div>
+					</c:if>
+					
+					<div class="form-group row form-inline">
+					    <label for="penaltyFactor" class="col-sm-3"> 
+					    	<fmt:message key="label.authoring.basic.penalty.factor" />
+							  <i class="fa fa-xs fa-asterisk text-danger" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 					    </label>
-					    <form:input path="penaltyFactor" cssClass="form-control short-input-text input-sm"/>
+					    
+					    <div class="col-sm-9">
+					    	<form:input path="penaltyFactor" cssClass="form-control short-input-text input-sm"/>
+					    </div>
 					</div>
 					
 					<div class="voffset5 form-group">
Index: lams_tool_assessment/web/pages/authoring/parts/addordering.jsp
===================================================================
diff -u -rba5d276f1fd9c153812980bf28ce318b714a664b -r78ae88b9a7c79f31eb1f795d084be7d283963885
--- lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	(.../addordering.jsp)	(revision ba5d276f1fd9c153812980bf28ce318b714a664b)
+++ lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	(.../addordering.jsp)	(revision 78ae88b9a7c79f31eb1f795d084be7d283963885)
@@ -118,20 +118,28 @@
 						</label>
 					</div>
 					
-					<div class="form-group form-inline">
-						<c:if test="${!isAuthoringRestricted}">
-						    <label for="defaultGrade">
-						    	<fmt:message key="label.authoring.basic.default.question.grade" />:
-						    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+					<c:if test="${!isAuthoringRestricted}">
+						<div class="form-group row form-inline">
+						    <label for="defaultGrade" class="col-sm-3">
+						    	<fmt:message key="label.authoring.basic.default.question.grade" />
+						    	<i class="fa fa-xs fa-asterisk text-danger" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 						    </label>
-						    <form:input path="defaultGrade" cssClass="form-control short-input-text input-sm"/>
-					    </c:if>
-	
-					    <label class="loffset10" for="penaltyFactor">
-					    	<fmt:message key="label.authoring.basic.penalty.factor" />:
-							  <i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+						    
+						    <div class="col-sm-9">
+						    	<form:input path="defaultGrade" cssClass="form-control short-input-text input-sm"/>
+						    </div>
+						</div>
+					</c:if>
+					
+					<div class="form-group row form-inline">
+					    <label for="penaltyFactor" class="col-sm-3"> 
+					    	<fmt:message key="label.authoring.basic.penalty.factor" />
+							  <i class="fa fa-xs fa-asterisk text-danger" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 					    </label>
-					    <form:input path="penaltyFactor" cssClass="form-control short-input-text input-sm"/>
+					    
+					    <div class="col-sm-9">
+					    	<form:input path="penaltyFactor" cssClass="form-control short-input-text input-sm"/>
+					    </div>
 					</div>
 									
 					<div class="voffset5 form-group">
Index: lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp
===================================================================
diff -u -r8a65083cf102509e0ca486f636746f56a600c514 -r78ae88b9a7c79f31eb1f795d084be7d283963885
--- lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
+++ lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision 78ae88b9a7c79f31eb1f795d084be7d283963885)
@@ -126,30 +126,41 @@
 						</label>
 					</div>
 					
-					<div class="form-group form-inline">
-						<c:if test="${!isAuthoringRestricted}">
-						    <label for="defaultGrade">
-						    	<fmt:message key="label.authoring.basic.default.question.grade" />:
-						    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+					<c:if test="${!isAuthoringRestricted}">
+						<div class="form-group row form-inline">
+						    <label for="defaultGrade" class="col-sm-3">
+						    	<fmt:message key="label.authoring.basic.default.question.grade" />
+						    	<i class="fa fa-xs fa-asterisk text-danger" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 						    </label>
-						    <form:input path="defaultGrade" cssClass="form-control short-input-text input-sm"/>
-					    </c:if>
-					    
-					    <label class="loffset10" for="penaltyFactor"> 
-					    	<fmt:message key="label.authoring.basic.penalty.factor" />:
-							<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+						    
+						    <div class="col-sm-9">
+						    	<form:input path="defaultGrade" cssClass="form-control short-input-text input-sm"/>
+						    </div>
+						</div>
+					</c:if>
+					
+					<div class="form-group row form-inline">
+					    <label for="penaltyFactor" class="col-sm-3"> 
+					    	<fmt:message key="label.authoring.basic.penalty.factor" />
+							  <i class="fa fa-xs fa-asterisk text-danger" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 					    </label>
-					    <form:input path="penaltyFactor" cssClass="form-control short-input-text input-sm"/>
+					    
+					    <div class="col-sm-9">
+					    	<form:input path="penaltyFactor" cssClass="form-control short-input-text input-sm"/>
+					    </div>
 					</div>
-																		
-					<div class="form-inline form-group">
-						<label for="caseSensitive">
-							<fmt:message key="label.authoring.short.answer.case.sensitivity" />:
+					
+					<div class="form-group row form-inline">
+						<label for="caseSensitive" class="col-sm-3">
+							<fmt:message key="label.authoring.short.answer.case.sensitivity" />
 						</label>
-						<form:select path="caseSensitive" cssClass="form-control input-sm">
-							<form:option value="false"><fmt:message key="label.authoring.short.answer.no.case.unimportant" /></form:option>
-							<form:option value="true"><fmt:message key="label.authoring.short.answer.yes.case.must.match" /></form:option>
-						</form:select>
+						
+						<div class="col-sm-9">
+							<form:select path="caseSensitive" id="caseSensitive" cssClass="form-control input-sm">
+								<form:option value="false"><fmt:message key="label.authoring.short.answer.no.case.unimportant" /></form:option>
+								<form:option value="true"><fmt:message key="label.authoring.short.answer.yes.case.must.match" /></form:option>
+							</form:select>
+						</div>
 					</div>
 	
 					<div class="voffset5 form-group">
Index: lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp
===================================================================
diff -u -r8a65083cf102509e0ca486f636746f56a600c514 -r78ae88b9a7c79f31eb1f795d084be7d283963885
--- lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
+++ lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision 78ae88b9a7c79f31eb1f795d084be7d283963885)
@@ -123,20 +123,28 @@
 						</label>
 					</div>				
 					
-					<div class="form-group form-inline">
-						<c:if test="${!isAuthoringRestricted}">
-						    <label for="defaultGrade">
-						    	<fmt:message key="label.authoring.basic.default.question.grade" />:
-						    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+					<c:if test="${!isAuthoringRestricted}">
+						<div class="form-group row form-inline">
+						    <label for="defaultGrade" class="col-sm-3">
+						    	<fmt:message key="label.authoring.basic.default.question.grade" />
+						    	<i class="fa fa-xs fa-asterisk text-danger" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 						    </label>
-						    <form:input path="defaultGrade" cssClass="form-control short-input-text input-sm"/>
-					    </c:if>
-					    
-					    <label class="loffset10" for="penaltyFactor">
-					    	<fmt:message key="label.authoring.basic.penalty.factor" />:
-							<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+						    
+						    <div class="col-sm-9">
+						    	<form:input path="defaultGrade" cssClass="form-control short-input-text input-sm"/>
+						    </div>
+						</div>
+					</c:if>
+					
+					<div class="form-group row form-inline">
+					    <label for="penaltyFactor" class="col-sm-3"> 
+					    	<fmt:message key="label.authoring.basic.penalty.factor" />
+							  <i class="fa fa-xs fa-asterisk text-danger" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 					    </label>
-					    <form:input path="penaltyFactor" cssClass="form-control short-input-text input-sm"/>
+					    
+					    <div class="col-sm-9">
+					    	<form:input path="penaltyFactor" cssClass="form-control short-input-text input-sm"/>
+					    </div>
 					</div>
 									
 					<div class="voffset5 form-group">
Index: lams_tool_assessment/web/pages/authoring/parts/numericaloption.jsp
===================================================================
diff -u -rba5d276f1fd9c153812980bf28ce318b714a664b -r78ae88b9a7c79f31eb1f795d084be7d283963885
--- lams_tool_assessment/web/pages/authoring/parts/numericaloption.jsp	(.../numericaloption.jsp)	(revision ba5d276f1fd9c153812980bf28ce318b714a664b)
+++ lams_tool_assessment/web/pages/authoring/parts/numericaloption.jsp	(.../numericaloption.jsp)	(revision 78ae88b9a7c79f31eb1f795d084be7d283963885)
@@ -15,7 +15,7 @@
 		</td>
 	</tr>
 
-	<tr class="settings-on-hover-hidden">
+	<tr class="option-settings-hidden" style="display: none;">
 		<td class="greyed-out-label">
 			<fmt:message key="label.authoring.basic.option.accepted.error"></fmt:message>
 		</td>
@@ -29,12 +29,12 @@
 	</tr>
 </table>
 
-<div class="settings-on-hover-hidden">
+<div class="option-settings-hidden" style="display: none;">
 	<%@ include file="gradeselector.jsp"%>
 	
 	<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="40px"/>
+	     	placeholder="${FEEDBACK_LABEL}" contentFolderID="${contentFolderID}" height="50px"/>
 	</div>
 </div>
Index: lams_tool_assessment/web/pages/authoring/parts/option.jsp
===================================================================
diff -u -r8a65083cf102509e0ca486f636746f56a600c514 -r78ae88b9a7c79f31eb1f795d084be7d283963885
--- lams_tool_assessment/web/pages/authoring/parts/option.jsp	(.../option.jsp)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
+++ lams_tool_assessment/web/pages/authoring/parts/option.jsp	(.../option.jsp)	(revision 78ae88b9a7c79f31eb1f795d084be7d283963885)
@@ -7,10 +7,10 @@
 		placeholder="${OPTION_LABEL}&thinsp; ${status.index+1}" contentFolderID="${contentFolderID}" height="50px"/>
 </div>
 
-<div class="settings-on-hover-hidden">
+<div class="option-settings-hidden" style="display: none;">
 	<%@ include file="gradeselector.jsp"%>
 
-	<div class="voffset5-bottom">
+	<div class="option-feedback 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"/>
Index: lams_tool_assessment/web/pages/authoring/parts/optionhedgingmark.jsp
===================================================================
diff -u -rba5d276f1fd9c153812980bf28ce318b714a664b -r78ae88b9a7c79f31eb1f795d084be7d283963885
--- lams_tool_assessment/web/pages/authoring/parts/optionhedgingmark.jsp	(.../optionhedgingmark.jsp)	(revision ba5d276f1fd9c153812980bf28ce318b714a664b)
+++ lams_tool_assessment/web/pages/authoring/parts/optionhedgingmark.jsp	(.../optionhedgingmark.jsp)	(revision 78ae88b9a7c79f31eb1f795d084be7d283963885)
@@ -7,7 +7,7 @@
 		placeholder="${OPTION_ANSWER_LABEL}&thinsp; ${status.index+1}" height="50px"/>
 </div>
 
-<div class="settings-on-hover-hidden">
+<div class="option-settings-hidden" style="display: none;">
 
 	<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"
@@ -27,6 +27,6 @@
 	<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="40px"/>
+	    	placeholder="${FEEDBACK_LABEL}" contentFolderID="${contentFolderID}" height="50px"/>
 	</div>
 </div>
Index: lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp
===================================================================
diff -u -r8a65083cf102509e0ca486f636746f56a600c514 -r78ae88b9a7c79f31eb1f795d084be7d283963885
--- lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp	(.../optionlist.jsp)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
+++ lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp	(.../optionlist.jsp)	(revision 78ae88b9a7c79f31eb1f795d084be7d283963885)
@@ -1,12 +1,146 @@
 <%@ 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;
+			if (id.startsWith("optionString")) {
+				var tableId = id.replace("optionString", "option-table-");
+				
+				e.editor.on( 'focus', function() {
+					//prevent expanding the already expanded table
+					if (expandedTable == tableId) {
+						return;
+					}
+
+					closeExpandedAreas();
+
+					$(".option-settings-hidden.delete-button", $("#" + tableId)).show();
+					$(".option-settings-hidden:not(.delete-button)", $("#" + tableId)).slideDown("slow")
+					//it's hack to make toolbar reposition in case it overlapped CKEditor after area expansion
+					.promise().done(function() {
+						CKEDITOR.instances[id].fire( 'change');
+					});
+
+					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');
+				    });
+				});
+*/
+			}
+		});
+
+		//take care about short answer and numerical 
+		$("[name^=optionString], [name^=optionFloat]").on("focus", function() {
+			var tableId = $(this).attr("name").replace("optionString", "option-table-").replace("optionFloat", "option-table-");
+			//prevent expanding the already expanded table
+			if (expandedTable == tableId) {
+				return;
+			}
+
+			closeExpandedAreas();
+
+			$(".option-settings-hidden.delete-button", $("#" + tableId)).show();
+			$(".option-settings-hidden:not(.delete-button)", $("#" + tableId)).slideDown("slow");
+
+			expandedTable = tableId;
+		});
+
+		// close all expanded areas on clicking anywhere outside of expanded table
+		$(document).click(function(event) {
+		    if (expandedTable && !$(event.target).closest("#" + expandedTable).length) {
+		    	closeExpandedAreas();
+		    }
+		});
+	});
+
+	//store which table is expanded
+	var expandedTable = "";
+	function closeExpandedAreas() {
+		//close all other expanded areas
+		$(".option-settings-hidden").slideUp("slow");
+		expandedTable = "";
+	}
+	 
+</script>
+
 <div id="optionArea">
 	<input type="hidden" name="optionCount" id="optionCount" value="${fn:length(optionList)}">
 	<input type="hidden" name="questionType" id="questionType" value="${questionType}" />
 	
-	<div id="option-table" class="hover-active">
+	<div id="option-table">
 		<c:forEach var="option" items="${optionList}" varStatus="status">
-			<table id="option-table-${status.index}" data-id="${status.index}">
+			<table id="option-table-${status.index}" data-id="${status.index}" tabindex="1">
 				<tr>
 					<td>
 						<span>${status.index+1}</span>
@@ -37,8 +171,8 @@
 	
 					<c:if test="${!isAuthoringRestricted}">
 						<td width="30px">
-							<i class="fa fa-trash delete-button" title="<fmt:message key="label.authoring.basic.delete" />"
-								onclick="javascript:removeOption(${status.index})"></i>
+							<i class="fa fa-trash delete-button option-settings-hidden" title="<fmt:message key="label.authoring.basic.delete" />"
+								onclick="javascript:removeOption(${status.index})" style="display: none;"></i>
 						</td>
 					</c:if>
 					
Index: lams_tool_assessment/web/pages/authoring/parts/shortansweroption.jsp
===================================================================
diff -u -r8a65083cf102509e0ca486f636746f56a600c514 -r78ae88b9a7c79f31eb1f795d084be7d283963885
--- lams_tool_assessment/web/pages/authoring/parts/shortansweroption.jsp	(.../shortansweroption.jsp)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
+++ lams_tool_assessment/web/pages/authoring/parts/shortansweroption.jsp	(.../shortansweroption.jsp)	(revision 78ae88b9a7c79f31eb1f795d084be7d283963885)
@@ -7,7 +7,7 @@
 		value="<c:out value='${option.optionString}' />" placeholder="${OPTION_LABEL}&thinsp; ${status.index+1}"/>
 </div>
 
-<div class="settings-on-hover-hidden">
+<div class="option-settings-hidden" style="display: none;">
 	<%@ include file="gradeselector.jsp"%>
 	
 	<div class="voffset5-bottom">