Index: lams_monitoring/web/includes/javascript/monitorLesson.js
===================================================================
diff -u -r04dc8d4e903e91324e653a2ff1c66cbacb057873 -r9f5e15981f571bc39cab273bf5393cf562254145
--- lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision 04dc8d4e903e91324e653a2ff1c66cbacb057873)
+++ lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision 9f5e15981f571bc39cab273bf5393cf562254145)
@@ -444,7 +444,8 @@
                     labelColour = 'danger';
                     break;
             }
-            $('#lessonStateLabel').attr('class', 'btn btn-sm btn-' + labelColour).html(label + ' <i class="fa-solid fa-angles-down"></i>');
+            $('#lessonStateLabel').attr('class', 'btn btn-sm btn-' + labelColour)
+                .html(label + (lessonStateId == 7 ? '' : '<i class="fa-solid fa-angles-down"></i>'));
 
             // update available options in change state dropdown menu
             var selectField = $('#lessonStateField');
@@ -766,7 +767,8 @@
         case 7:
             showConfirm(LABELS.LESSON_REMOVE_ALERT, function() {
                 showConfirm(LABELS.LESSON_REMOVE_DOUBLECHECK_ALERT, function() {
-                    method = "removeLesson";
+                    // this is a callback, so standard processing won't work here
+                    applyStateChange(state, "removeLesson");
                 });
             });
             break;
Index: lams_monitoring/web/monitor.jsp
===================================================================
diff -u -r6859554ab9421fe19d47ab72fb34a5c03ea2a89a -r9f5e15981f571bc39cab273bf5393cf562254145
--- lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision 6859554ab9421fe19d47ab72fb34a5c03ea2a89a)
+++ lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision 9f5e15981f571bc39cab273bf5393cf562254145)
@@ -330,69 +330,77 @@
 						<dt><fmt:message key="lesson.state"/>
 						</dt>
 						<dd>
-							<button data-bs-toggle="collapse" data-bs-target="#changeState" id="lessonStateLabel" class="lessonManageField"></button>
-							<div style="display:inline-block;vertical-align: middle;"><span id="lessonStartDateSpan" class="lessonManageField loffset5"></span>
-								<span id="lessonFinishDateSpan" class="lessonManageField loffset5"></span></div>
+							<button data-bs-toggle="collapse" data-bs-target="#changeState" id="lessonStateLabel" class="lessonManageField"
+								<c:if test="${lesson.lessonStateID eq 7}">
+									disabled
+								</c:if>
+							></button>
+							<c:if test="${lesson.lessonStateID != 7}">
+								<div style="display:inline-block;vertical-align: middle;">
+									<span id="lessonStartDateSpan" class="lessonManageField loffset5"></span>
+									<span id="lessonFinishDateSpan" class="lessonManageField loffset5"></span>
+								</div>
 
-							<!--  Change lesson status or start/schedule start -->
-							<div class="collapse offset10" id="changeState">
-								<div id="lessonScheduler">
-									<form>
-										<div id="lessonStartApply">
-											<div class="form-group mt-2" >
-												<label for="scheduleDatetimeField" class="form-label"><fmt:message key="lesson.start"/></label>
-												<input class="lessonManageField form-control-sm" id="scheduleDatetimeField" type="text" autocomplete="nope" />
-											</div>
+								<!--  Change lesson status or start/schedule start -->
+								<div class="collapse offset10" id="changeState">
+									<div id="lessonScheduler">
+										<form>
+											<div id="lessonStartApply">
+												<div class="form-group mt-2" >
+													<label for="scheduleDatetimeField" class="form-label"><fmt:message key="lesson.start"/></label>
+													<input class="lessonManageField form-control-sm" id="scheduleDatetimeField" type="text" autocomplete="nope" />
+												</div>
 
-											<div class="mt-2">
-												<a id="scheduleLessonButton" class="btn btn-sm btn-default lessonManageField" href="#"
-												   onClick="javascript:scheduleLesson()"
-												   title='<fmt:message key="button.schedule.tooltip"/>'>
-													<fmt:message key="button.schedule"/>
-												</a>
-												<a id="startLessonButton" class="btn btn-sm btn-secondary" href="#"
-												   onClick="javascript:startLesson()"
-												   title='<fmt:message key="button.start.now.tooltip"/>'>
-													<fmt:message key="button.start.now"/>
-												</a>
+												<div class="mt-2">
+													<a id="scheduleLessonButton" class="btn btn-sm btn-default lessonManageField" href="#"
+													   onClick="javascript:scheduleLesson()"
+													   title='<fmt:message key="button.schedule.tooltip"/>'>
+														<fmt:message key="button.schedule"/>
+													</a>
+													<a id="startLessonButton" class="btn btn-sm btn-secondary" href="#"
+													   onClick="javascript:startLesson()"
+													   title='<fmt:message key="button.start.now.tooltip"/>'>
+														<fmt:message key="button.start.now"/>
+													</a>
+												</div>
 											</div>
-										</div>
 
-										<div id="lessonDisableApply">
-											<div class="form-group mt-2">
-												<label for="disableDatetimeField" class="form-label d-block"><fmt:message key="lesson.end"/></label>
-												<input class="lessonManageField form-control-sm" id="disableDatetimeField" type="text"/>
+											<div id="lessonDisableApply">
+												<div class="form-group mt-2">
+													<label for="disableDatetimeField" class="form-label d-block"><fmt:message key="lesson.end"/></label>
+													<input class="lessonManageField form-control-sm" id="disableDatetimeField" type="text"/>
+												</div>
+												<div class="mt-2">
+													<a id="scheduleDisableLessonButton" class="btn btn-sm btn-secondary lessonManageField" href="#"
+													   onClick="javascript:scheduleDisableLesson()"
+													   title='<fmt:message key="button.schedule.disable.tooltip"/>'>
+														<fmt:message key="button.schedule"/>
+													</a>
+													<a id="disableLessonButton" class="btn btn-sm btn-secondary" href="#"
+													   onClick="javascript:disableLesson()"
+													   title='<fmt:message key="button.disable.now.tooltip"/>'>
+														<fmt:message key="button.disable.now"/>
+													</a>
+												</div>
 											</div>
-											<div class="mt-2">
-												<a id="scheduleDisableLessonButton" class="btn btn-sm btn-secondary lessonManageField" href="#"
-												   onClick="javascript:scheduleDisableLesson()"
-												   title='<fmt:message key="button.schedule.disable.tooltip"/>'>
-													<fmt:message key="button.schedule"/>
-												</a>
-												<a id="disableLessonButton" class="btn btn-sm btn-secondary" href="#"
-												   onClick="javascript:disableLesson()"
-												   title='<fmt:message key="button.disable.now.tooltip"/>'>
-													<fmt:message key="button.disable.now"/>
-												</a>
-											</div>
-										</div>
-									</form>
-								</div>
+										</form>
+									</div>
 
-								<div id="lessonStateChanger">
-									<select id="lessonStateField" class="form-select-sm mt-2" onchange="lessonStateFieldChanged()">
-										<option value="-1"><fmt:message key="lesson.select.state"/></option>
-									</select>
-									<span id="lessonStateApply">
-									<button type="button" class="lessonManageField btn btn-sm btn-primary"
-											onClick="javascript:changeLessonState()"
-											title='<fmt:message key="lesson.change.state.tooltip"/>'>
-								   		<i class="fa fa-check"></i> 
-								   		<span class="hidden-xs"><fmt:message key="button.apply"/></span>
-							    	</button>
-							    </span>
+									<div id="lessonStateChanger">
+										<select id="lessonStateField" class="form-select-sm mt-2" onchange="lessonStateFieldChanged()">
+											<option value="-1"><fmt:message key="lesson.select.state"/></option>
+										</select>
+										<span id="lessonStateApply">
+										<button type="button" class="lessonManageField btn btn-sm btn-primary"
+												onClick="javascript:changeLessonState()"
+												title='<fmt:message key="lesson.change.state.tooltip"/>'>
+											<i class="fa fa-check"></i>
+											<span class="hidden-xs"><fmt:message key="button.apply"/></span>
+										</button>
+									</span>
+									</div>
 								</div>
-							</div>
+							</c:if>
 						</dd>
 
 						<!--