Index: lams_monitoring/web/css/components-monitoring.css
===================================================================
diff -u -r798e370ebcf193550faac45abc916946a96ac0b6 -rc955a8e34498e3e061ae1e1bd2f11ed41cdca463
--- lams_monitoring/web/css/components-monitoring.css	(.../components-monitoring.css)	(revision 798e370ebcf193550faac45abc916946a96ac0b6)
+++ lams_monitoring/web/css/components-monitoring.css	(.../components-monitoring.css)	(revision c955a8e34498e3e061ae1e1bd2f11ed41cdca463)
@@ -143,7 +143,6 @@
 }
 
 .component-sidebar .lesson-properties .btn {
-	display: block !important;
 	margin-top: .5rem;
 }
 
Index: lams_monitoring/web/includes/javascript/monitorLesson5.js
===================================================================
diff -u -r21d949ef7d0636fd77f242eda8721ec7df8c59f5 -rc955a8e34498e3e061ae1e1bd2f11ed41cdca463
--- lams_monitoring/web/includes/javascript/monitorLesson5.js	(.../monitorLesson5.js)	(revision 21d949ef7d0636fd77f242eda8721ec7df8c59f5)
+++ lams_monitoring/web/includes/javascript/monitorLesson5.js	(.../monitorLesson5.js)	(revision c955a8e34498e3e061ae1e1bd2f11ed41cdca463)
@@ -1483,13 +1483,6 @@
 	// clear all learner icons
 	$('.learner-icon, .more-learner-icon', '#canvas-container').remove();
 	
-	var sequenceTopButtonsContainer = $('#sequenceTopButtonsContainer');
-	if ($('img#sequenceCanvasLoading', sequenceTopButtonsContainer).length == 0){
-		$('#sequenceCanvasLoading')
-				.clone().appendTo(sequenceTopButtonsContainer)
-				.css('display', 'block');
-	}
-	
 	$.ajax({
 		dataType : 'json',
 		url : LAMS_URL + 'monitoring/monitoring/getLessonProgress.do',
@@ -1504,9 +1497,6 @@
 				$('g[uiid="' + this.uiid + '"]', sequenceCanvas).attr('id', this.id);
 			});
 
-			// remove the loading animation
-			$('img#sequenceCanvasLoading', sequenceTopButtonsContainer).remove();
-
 			var learnerCount = 0;
 			$.each(response.activities, function(index, activity){
 				var activityGroup = $('g[id="' + activity.id + '"]', sequenceCanvas),
@@ -1610,25 +1600,21 @@
 function updateLiveEdit() {
 	if ( liveEditEnabled ) {
 		if ( lockedForEdit ) {
-			if ( userId == lockedForEditUserId ) {
-				$("#liveEditButton").removeClass('btn-default');
-				$("#liveEditButton").addClass('btn-primary');
+			if ( +userId == lockedForEditUserId ) {
+				$("#liveEditButton").removeClass('btn-primary');
+				$("#liveEditButton").addClass('btn-warning');
 				$("#liveEditButton").show();
 				$("#liveEditWarning").hide();
-				$("#liveEditWarning").text("");
 			} else {
-				$("#liveEditButton").removeClass('btn-primary');
-				$("#liveEditButton").addClass('btn-default');
 				$("#liveEditButton").hide();
 				$("#liveEditWarning").text(LABELS.LIVE_EDIT_WARNING.replace("%0",lockedForEditUsername));
 				$("#liveEditWarning").show();
 			}
 		} else {
-			$("#liveEditButton").removeClass('btn-primary');
-			$("#liveEditButton").addClass('btn-default');
+			$("#liveEditButton").removeClass('btn-warning');
+			$("#liveEditButton").addClass('btn-primary');
 			$("#liveEditButton").show();
 			$("#liveEditWarning").hide();
-			$("#liveEditWarning").text("");
 		}
 	} else {
 		$("#liveEditButton").hide();
Index: lams_monitoring/web/monitor-sequence-tab.jsp
===================================================================
diff -u -rcf2906d36c4c029795756a4e9bb5aceacd6d7ab5 -rc955a8e34498e3e061ae1e1bd2f11ed41cdca463
--- lams_monitoring/web/monitor-sequence-tab.jsp	(.../monitor-sequence-tab.jsp)	(revision cf2906d36c4c029795756a4e9bb5aceacd6d7ab5)
+++ lams_monitoring/web/monitor-sequence-tab.jsp	(.../monitor-sequence-tab.jsp)	(revision c955a8e34498e3e061ae1e1bd2f11ed41cdca463)
@@ -4,13 +4,8 @@
 <div id="sequence-tab-content" class="container-fluid">
 	<div class="row">
 		<div class="col sequence-tab-layout-column">
+			<div style="display:none" class="text-danger fw-bold" id="liveEditWarning"></div>
 			<div id="canvas-container" class="svg-learner-draggable-area text-start monitoring-panel">
-				<div id="sequenceTopButtonsContainer" class="topButtonsContainer">
-					<a id="liveEditButton" class="btn btn-sm btn-secondary float-end" style="display:none" title="<fmt:message key='button.live.edit.tooltip'/>"
-				       href="#" onClick="javascript:openLiveEdit()">
-						<i class="fa fa-pencil"></i> <span class="hidden-xs"><fmt:message key='button.live.edit'/></span>
-					</a>
-				</div>
 				<div id="sequenceCanvas"></div>
 				<div id="completedLearnersContainer" class="mt-2" title="<fmt:message key='force.complete.end.lesson.tooltip' />">
 					<img id="completedLessonLearnersIcon" src="<lams:LAMSURL/>images/completed.svg" />
Index: lams_monitoring/web/monitor5.jsp
===================================================================
diff -u -r21d949ef7d0636fd77f242eda8721ec7df8c59f5 -rc955a8e34498e3e061ae1e1bd2f11ed41cdca463
--- lams_monitoring/web/monitor5.jsp	(.../monitor5.jsp)	(revision 21d949ef7d0636fd77f242eda8721ec7df8c59f5)
+++ lams_monitoring/web/monitor5.jsp	(.../monitor5.jsp)	(revision c955a8e34498e3e061ae1e1bd2f11ed41cdca463)
@@ -507,6 +507,13 @@
 								<span class="hidden-xs">Edit lesson name</span>
 							</button>
 							
+							<button id="liveEditButton" class="btn btn-sm btn-primary" style="display:none"
+									type="button" onClick="javascript:openLiveEdit()"
+									title='<fmt:message key='button.live.edit.tooltip'/>'>
+								<i class="fa fa-pen-to-square"></i>
+								<span class="hidden-xs"><fmt:message key='button.live.edit'/></span>
+							</button>
+							
 							<button id="viewLearnersButton" class="btn btn-sm btn-primary"
 									type="button" onClick="javascript:showLessonLearnersDialog()"
 									title='<fmt:message key="button.view.learners.tooltip"/>'>