Index: lams_monitoring/web/css/_monitorLesson_base.scss
===================================================================
diff -u -rfe122f9f7ac40f3a3696a7c69043fc34df7994d4 -r312140979ac91708e16d2b57c98f53c13e99ab24
--- lams_monitoring/web/css/_monitorLesson_base.scss	(.../_monitorLesson_base.scss)	(revision fe122f9f7ac40f3a3696a7c69043fc34df7994d4)
+++ lams_monitoring/web/css/_monitorLesson_base.scss	(.../_monitorLesson_base.scss)	(revision 312140979ac91708e16d2b57c98f53c13e99ab24)
@@ -177,7 +177,19 @@
 	margin-right: 5px;
 }
 
-#lessonStateLabel{
+#disableLessonButton {
+	display: none;
+}
+
+#lessonScheduler label {
+	margin-top: 5px;
+}
+
+#lessonStartApply {
+	margin-bottom: 5px;
+}
+
+#lessonStateLabel, #lessonScheduler input {
 	font-size:13px; // Larger than buttons but smaller than the date text next to it.
 }
 
Index: lams_monitoring/web/includes/javascript/monitorLesson.js
===================================================================
diff -u -ra4002ee13a835e74c08e3d657494f1c97b531013 -r312140979ac91708e16d2b57c98f53c13e99ab24
--- lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision a4002ee13a835e74c08e3d657494f1c97b531013)
+++ lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision 312140979ac91708e16d2b57c98f53c13e99ab24)
@@ -1,4 +1,4 @@
-// ********** GLOBAL VARIABLES **********
+// ********** GLOBAL VARIABLES **********
 // copy of lesson SVG so it does no need to be fetched every time
 var originalSequenceCanvas = null,
 // DIV container for lesson SVG
@@ -221,8 +221,11 @@
 		case 4: 
 			$('#lessonScheduler').show();
 			$('#lessonStartApply').hide();
-			$('#lessonDisableApply').show();
 			$('#lessonStateApply').hide();
+			$("#scheduleDisableLessonButton").html(LABELS.SCHEDULE);
+			$("#scheduleDisableLessonButton").css('display', 'inline'); // must be inline or it will be wrong size
+			$("#disableLessonButton").show();
+			$('#lessonDisableApply').show();
 			break;
 		default:
 			$('#lessonDisableApply').hide();
@@ -315,9 +318,9 @@
 			} else {
 				refreshMonitor('lesson');
 			}
-			if ( newLessonEndDate ) {
+			if ( state == 4 ) {
 				lessonEndDate = newLessonEndDate;
-			}
+			} 	
 		}
 	});
 }
@@ -398,7 +401,7 @@
 			}
 			
 			// show/remove widgets for lesson scheduling
-			var scheduleControls = $('#scheduleDatetimeField, #scheduleLessonButton, #startLessonButton, #lessonScheduler'),
+			var scheduleControls = $('#scheduleDatetimeField, #scheduleLessonButton, #startLessonButton, #lessonScheduler, #scheduleDisableLessonButton, #disableLessonButton'),
 				startDateField = $('#lessonStartDateSpan'),
 				lessonFinishDateSpan = $('#lessonFinishDateSpan'),
 				disableDateSpan = $('#lessonDisableApply'),
@@ -432,13 +435,12 @@
 					lessonStateChanger.hide();
 					break;
 				//started lesson
-				default: 			
+				default: 		
 				 	if ( response.finishDate ) {
 						scheduleControls.css('display','inline');
 						$("#lessonStartApply").css('display','none');
 				 		lessonFinishDateSpan.text(LABELS.LESSON_FINISH.replace("%0",response.finishDate)).css('display','inline');
 						$("#scheduleDisableLessonButton").html(LABELS.RESCHEDULE);
-						$("#disableLessonButton").css('display', 'none');
 				 	} else {
 						scheduleControls.css('display','none');
 						startDateField.text(response.startDate).hide();
Index: lams_monitoring/web/monitor.jsp
===================================================================
diff -u -ra4002ee13a835e74c08e3d657494f1c97b531013 -r312140979ac91708e16d2b57c98f53c13e99ab24
--- lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision a4002ee13a835e74c08e3d657494f1c97b531013)
+++ lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision 312140979ac91708e16d2b57c98f53c13e99ab24)
@@ -335,7 +335,7 @@
 									<div class="collapse offset10" id="changeState">
 										<div id="lessonScheduler">
 											<form class="form-horizontal">
-												<div class="form-group" id="lessonStartApply" style="margin-bottom: 5px;">
+												<div class="form-group" id="lessonStartApply">
 													<label for="scheduleDatetimeField" class="col-sm-1"><fmt:message key="lesson.start"/></label>
 													<div class="col-sm-8">
 													<input class="lessonManageField input-sm" id="scheduleDatetimeField" type="text"/>
@@ -362,8 +362,7 @@
 													</a>
 													<a id="disableLessonButton" class="btn btn-xs btn-default" href="#"
 														   onClick="javascript:disableLesson()"
-														   title='<fmt:message key="button.disable.now.tooltip"/>'
-														   style="display:none">
+														   title='<fmt:message key="button.disable.now.tooltip"/>'>
 													   <fmt:message key="button.disable.now"/>
 													</a>
 													</div>