Index: lams_central/web/css/_inlineeditor.scss
===================================================================
diff -u -r32670937f259e2c8a712e1dd2cd6bb5731f466c9 -rc8cf9027d03f39a61d2516ece7f158ffc8cc2001
--- lams_central/web/css/_inlineeditor.scss	(.../_inlineeditor.scss)	(revision 32670937f259e2c8a712e1dd2cd6bb5731f466c9)
+++ lams_central/web/css/_inlineeditor.scss	(.../_inlineeditor.scss)	(revision c8cf9027d03f39a61d2516ece7f158ffc8cc2001)
@@ -27,3 +27,8 @@
 .cke_reset_all {
 	width: 70% !important;
 }
+
+/** Overwrite CKEditor's default CSS, so that content in an editor is displayed the same way as in real life */
+.cke_widget_inline {
+    display: block !important;
+}
\ No newline at end of file
Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -rc8cf9027d03f39a61d2516ece7f158ffc8cc2001
--- lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision c8cf9027d03f39a61d2516ece7f158ffc8cc2001)
@@ -36,9 +36,9 @@
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.jgrowl.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/bootstrap-slider.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/Sortable.js"></script>
 	<script type="text/javascript">
 		$(document).ready(function(){
-			
 			//if isLeadershipEnabled - enable/disable submit buttons for hedging marks type of questions
 			if (${isLeadershipEnabled}) {
 				$(".mark-hedging-select").on('change keydown keypress keyup paste', function() {
@@ -67,6 +67,28 @@
 
 			//initialize bootstrap-sliders if "Enable confidence level" option is ON
 			$('.bootstrap-slider').bootstrapSlider();
+
+			//init options sorting feature
+			if (${hasEditRight}) {
+				$("table.ordering-table tbody").each(function () {
+					new Sortable($(this)[0], {
+					    animation: 150,
+					    ghostClass: 'sortable-placeholder',
+					    direction: 'vertical',
+						store: {
+							set: function (sortable) {
+								//update all sequenceIds in order to later save it as options' order
+								for (var i = 0; i < sortable.el.rows.length; i++) {
+									var tr = sortable.el.rows[i];
+									var input = $("input", $(tr));
+								    input.val(i+1);
+								}
+							}
+						}			            
+			        });
+			    });
+			}
+			
 		});
 		
 		function countHedgeQuestionSelectTotal(questionIndex) {
@@ -243,31 +265,6 @@
                 }
 			});
 		}
-
-		function upOption(questionUid, idx){
-			var orderingArea = "#orderingArea" + questionUid;
-			var url = "<c:url value="/learning/upOption.do"/>";
-			$(orderingArea).load(
-					url,
-					{
-						questionUid: questionUid,
-						optionIndex: idx, 
-						sessionMapID: "${sessionMapID}"
-					}
-			);
-		}
-		function downOption(questionUid, idx){
-			var orderingArea = "#orderingArea" + questionUid;
-			var url = "<c:url value="/learning/downOption.do"/>";
-			$(orderingArea).load(
-				url,
-				{
-					questionUid: questionUid,
-					optionIndex: idx, 
-					sessionMapID: "${sessionMapID}"
-				}
-			);		    
-		}		
 		
 		if (${!hasEditRight && mode != "teacher"}) {
 			setInterval("checkLeaderProgress();", 15000);// Auto-Refresh every 15 seconds for non-leaders
Index: lams_tool_assessment/web/pages/learning/parts/ordering.jsp
===================================================================
diff -u -r21e3286385ca1c464997e9792460b7712d23dcdd -rc8cf9027d03f39a61d2516ece7f158ffc8cc2001
--- lams_tool_assessment/web/pages/learning/parts/ordering.jsp	(.../ordering.jsp)	(revision 21e3286385ca1c464997e9792460b7712d23dcdd)
+++ lams_tool_assessment/web/pages/learning/parts/ordering.jsp	(.../ordering.jsp)	(revision c8cf9027d03f39a61d2516ece7f158ffc8cc2001)
@@ -6,7 +6,7 @@
 	</div>
 	
 	<div class="table-responsive">
-		<table class="table table-condensed ordering-table">
+		<table class="table table-sm ordering-table">
 			<c:forEach var="option" items="${question.optionDtos}" varStatus="ordStatus">
 				<tr>
 					<td class="ordering-option">
Index: lams_tool_assessment/web/pages/learning/results/ordering.jsp
===================================================================
diff -u -r21e3286385ca1c464997e9792460b7712d23dcdd -rc8cf9027d03f39a61d2516ece7f158ffc8cc2001
--- lams_tool_assessment/web/pages/learning/results/ordering.jsp	(.../ordering.jsp)	(revision 21e3286385ca1c464997e9792460b7712d23dcdd)
+++ lams_tool_assessment/web/pages/learning/results/ordering.jsp	(.../ordering.jsp)	(revision c8cf9027d03f39a61d2516ece7f158ffc8cc2001)
@@ -5,7 +5,7 @@
 </div>
 	
 <div class="table-responsive">
-	<table class="table table-hover table-condensed">
+	<table class="table table-hover table-sm">
 		<c:forEach var="option" items="${question.optionDtos}" varStatus="ordStatus">
 			<tr>
 				<td class="complete-item-gif">