Index: lams_monitoring/web/monitor.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/monitor.jsp,v
diff -u -r1.27.2.56 -r1.27.2.57
--- lams_monitoring/web/monitor.jsp	28 Apr 2017 21:30:13 -0000	1.27.2.56
+++ lams_monitoring/web/monitor.jsp	28 Apr 2017 21:33:19 -0000	1.27.2.57
@@ -267,9 +267,10 @@
 									</dd>
 								</c:if>
 								<dt><fmt:message key="lesson.state"/></dt>
-								<dd><span data-toggle="collapse" data-target="#changeState" id="lessonStateLabel"></span>
+								<dd>
+									<span data-toggle="collapse" data-target="#changeState" id="lessonStateLabel"></span>
 								  
-								  <!--  Change lesson status or start/schedule start -->
+									<!--  Change lesson status or start/schedule start -->
 									<div class="collapse offset10" id="changeState">
 										<div id="lessonScheduler">
 											<form class="form-inline">
@@ -279,34 +280,33 @@
 													
 													<span id="lessonStartDateSpan" class="lessonManageField"></span>
 													<a id="scheduleLessonButton" class="btn btn-xs btn-default lessonManageField" href="#"
-													   onClick="javascript:scheduleLesson()"
-													   title='<fmt:message key="button.schedule.tooltip"/>'>
+														   onClick="javascript:scheduleLesson()"
+														   title='<fmt:message key="button.schedule.tooltip"/>'>
 													   <fmt:message key="button.schedule"/>
 													</a>
+													
 													<a id="startLessonButton" class="btn btn-xs btn-default" href="#"
-													   onClick="javascript:startLesson()"
-													   title='<fmt:message key="button.start.now.tooltip"/>'>
+														   onClick="javascript:startLesson()"
+														   title='<fmt:message key="button.start.now.tooltip"/>'>
 													   <fmt:message key="button.start.now"/>
 													</a>
 												</div>
 											</form>
 										</div>
 										
-										<div id="lessonStateChanger">									
-											<span id="lessonStartDateSpan" class="lessonManageField"></span>
+										<div id="lessonStateChanger">
 											<select id="lessonStateField" class="btn btn-xs">
 												<option value="-1"><fmt:message key="lesson.select.state"/></option>
 											</select>
-											
 											<button type="button" class="btn btn-xs 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>
+													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>
-								    	</div>						
+								    	</div>					
 									</div>
 								</dd>
-								
 								<dt><fmt:message key="lesson.learners"/>:</dt>
 								<dd title='<fmt:message key="lesson.ratio.learners.tooltip"/>' id="learnersStartedPossibleCell"></dd>
 								<c:set var="showLearnerURL" value="${Configuration.get(ConfigurationKeys.ALLOW_DIRECT_LESSON_LAUNCH)}" />
Index: lams_monitoring/web/includes/javascript/monitorLesson.js
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/includes/javascript/monitorLesson.js,v
diff -u -r1.44.2.67 -r1.44.2.68
--- lams_monitoring/web/includes/javascript/monitorLesson.js	24 Apr 2017 01:25:33 -0000	1.44.2.67
+++ lams_monitoring/web/includes/javascript/monitorLesson.js	28 Apr 2017 21:33:19 -0000	1.44.2.68
@@ -310,19 +310,24 @@
 				lessonStateChanger = $('#lessonStateChanger'),
 				stateLabel = $('#lessonStateLabel');
 			switch (lessonStateId) {
-				 case 1:
-					 scheduleControls.css('display','inline');
-					 startDateField.css('display','none');
-					 lessonStateChanger.css('display','none');
-					 break;
-				 case 2:
-					 scheduleControls.css('display','none');
-					 startDateField.text(response.startDate).add('#startLessonButton').css('display','inline');
-					 lessonStateChanger.css('display','none');
-					 break;
+				//created but not started lesson
+				case 1:
+					scheduleControls.css('display','inline');
+					startDateField.hide();
+					lessonStateChanger.hide();
+					break;
+				//schedules lesson
+				case 2:
+					scheduleControls.css('display','inline');
+					$("#scheduleDatetimeField").hide();
+					$("#scheduleLessonButton").hide();
+					startDateField.text(response.startDate).add('#startLessonButton').css('display','inline');
+					lessonStateChanger.hide();
+					break;
+				//started lesson
 				default: 			
-					scheduleControls.css('display','none');
-				 	startDateField.text(response.startDate).css('display','none');
+					scheduleControls.hide();
+				 	startDateField.text(response.startDate).hide();
 				 	lessonStateChanger.css('display','inline');
 				 	stateLabel.attr('title',response.startDate);
 				 	break;