Index: lams_central/web/includes/javascript/ckconfig_custom.js
===================================================================
diff -u -r78ae88b9a7c79f31eb1f795d084be7d283963885 -re9c2ee2d130911342b4c1311809cff6ea0da8ede
--- lams_central/web/includes/javascript/ckconfig_custom.js	(.../ckconfig_custom.js)	(revision 78ae88b9a7c79f31eb1f795d084be7d283963885)
+++ lams_central/web/includes/javascript/ckconfig_custom.js	(.../ckconfig_custom.js)	(revision e9c2ee2d130911342b4c1311809cff6ea0da8ede)
@@ -185,15 +185,21 @@
 		f.data.dataValue = tempDiv.innerHTML;
 	});
 	
-	//add cke_filled class, when editor gets filled
-	e.editor.on('change', function(event) {
-		var ckeditorData = event.editor.getData();
+	//function adds "cke_filled" class to CKEditor, if it's not empty. And removes it otherwise.
+	var placeholderLessenHandler = function(editor) {
+		var ckeditorData = 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");
+			editor._.editable.$.classList.remove("cke_filled");
 		} else {
-			event.editor._.editable.$.classList.add("cke_filled");
+			editor._.editable.$.classList.add("cke_filled");
 		}
+	}
+	//add cke_filled class on editor's instanceReady
+	placeholderLessenHandler(e.editor);
+	//add cke_filled class on editor gets changed
+	e.editor.on('change', function(event) {
+		placeholderLessenHandler(event.editor);
 	});
 });
Index: lams_tool_assessment/web/includes/css/addQuestion.scss
===================================================================
diff -u -r78ae88b9a7c79f31eb1f795d084be7d283963885 -re9c2ee2d130911342b4c1311809cff6ea0da8ede
--- lams_tool_assessment/web/includes/css/addQuestion.scss	(.../addQuestion.scss)	(revision 78ae88b9a7c79f31eb1f795d084be7d283963885)
+++ lams_tool_assessment/web/includes/css/addQuestion.scss	(.../addQuestion.scss)	(revision e9c2ee2d130911342b4c1311809cff6ea0da8ede)
@@ -87,6 +87,9 @@
 .voffset5-bottom {
 	margin-bottom: 5px;
 }
+.voffset10-bottom {
+	margin-bottom: 10px;
+}
 
 #title {
 	width: 100%;
Index: lams_tool_assessment/web/pages/authoring/parts/optionhedgingmark.jsp
===================================================================
diff -u -r78ae88b9a7c79f31eb1f795d084be7d283963885 -re9c2ee2d130911342b4c1311809cff6ea0da8ede
--- lams_tool_assessment/web/pages/authoring/parts/optionhedgingmark.jsp	(.../optionhedgingmark.jsp)	(revision 78ae88b9a7c79f31eb1f795d084be7d283963885)
+++ lams_tool_assessment/web/pages/authoring/parts/optionhedgingmark.jsp	(.../optionhedgingmark.jsp)	(revision e9c2ee2d130911342b4c1311809cff6ea0da8ede)
@@ -9,7 +9,7 @@
 
 <div class="option-settings-hidden" style="display: none;">
 
-	<div class="voffset5-bottom" style="margin-top: 5px;">
+	<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"
 			<c:if test="${option.correct}">checked="checked"</c:if>>
 	</div>
Index: lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp
===================================================================
diff -u -r78ae88b9a7c79f31eb1f795d084be7d283963885 -re9c2ee2d130911342b4c1311809cff6ea0da8ede
--- lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp	(.../optionlist.jsp)	(revision 78ae88b9a7c79f31eb1f795d084be7d283963885)
+++ lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp	(.../optionlist.jsp)	(revision e9c2ee2d130911342b4c1311809cff6ea0da8ede)
@@ -37,10 +37,15 @@
 
 					closeExpandedAreas();
 
+					//hide toolbar until area is not expanded. otherwise it laggs during position change
+					$("#cke_" + id).hide();
+
 					$(".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
+					$(".option-settings-hidden:not(.delete-button)", $("#" + tableId)).slideDown()
 					.promise().done(function() {
+						//show toolbar after area got expanded
+						$("#cke_" + id).show();
+						//it's hack to make toolbar reposition in case it overlapped CKEditor after area expansion	
 						CKEDITOR.instances[id].fire( 'change');
 					});
 
@@ -111,14 +116,21 @@
 			closeExpandedAreas();
 
 			$(".option-settings-hidden.delete-button", $("#" + tableId)).show();
-			$(".option-settings-hidden:not(.delete-button)", $("#" + tableId)).slideDown("slow");
+			$(".option-settings-hidden:not(.delete-button)", $("#" + tableId)).slideDown();
 
 			expandedTable = tableId;
 		});
 
 		// close all expanded areas on clicking anywhere outside of expanded table
 		$(document).click(function(event) {
-		    if (expandedTable && !$(event.target).closest("#" + expandedTable).length) {
+		    if (expandedTable
+				    // allow clicking inside CKEditor area
+				    && !$(event.target).closest("#" + expandedTable).length
+				    // clicking on CKEditor toolbar
+				    && !$(event.target).closest(".cke_top").length
+				    // clicking on CKEditor toolbar
+				    && !$(event.target).closest(".cke_dialog").length
+				    ) {
 		    	closeExpandedAreas();
 		    }
 		});
@@ -128,7 +140,7 @@
 	var expandedTable = "";
 	function closeExpandedAreas() {
 		//close all other expanded areas
-		$(".option-settings-hidden").slideUp("slow");
+		$(".option-settings-hidden").slideUp();
 		expandedTable = "";
 	}
 	 
@@ -140,7 +152,7 @@
 	
 	<div id="option-table">
 		<c:forEach var="option" items="${optionList}" varStatus="status">
-			<table id="option-table-${status.index}" data-id="${status.index}" tabindex="1">
+			<table id="option-table-${status.index}" class="voffset10-bottom" data-id="${status.index}" tabindex="1">
 				<tr>
 					<td>
 						<span>${status.index+1}</span>