Index: lams_monitoring/web/.timer.jsp.swp
===================================================================
diff -u
Binary files differ
Index: lams_monitoring/web/includes/javascript/monitorLesson.js
===================================================================
diff -u -rc177c5ddcbb7f4882a4c128b28a51c5a995995c7 -rca8512dd8cc9ec8e34da6f0248304d5194e6e673
--- lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision c177c5ddcbb7f4882a4c128b28a51c5a995995c7)
+++ lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision ca8512dd8cc9ec8e34da6f0248304d5194e6e673)
@@ -207,7 +207,7 @@
     // initialise lesson dialog
 	var learnerGroupDialog = showDialog('learnerGroupDialog',{
 			'autoOpen'  : false,
-			'height'	: 700,
+			'height'	: 860,
 			'resizable' : true,
 			'open'      : function(){
 				// until operator selects an user, buttons remain disabled
@@ -217,7 +217,7 @@
 			}
 		}, false);
 	
-	$('.modal-body', learnerGroupDialog).empty().append(learnerGroupDialogContents.show()).closest('.modal-dialog').addClass('modal-lg');;
+	$('.modal-body', learnerGroupDialog).empty().append(learnerGroupDialogContents.show()).closest('.modal-dialog').addClass('modal-xl');;
 	
 	// search for users with the term the Monitor entered
 	$('.dialogSearchPhrase', learnerGroupDialog).autocomplete({
@@ -374,15 +374,15 @@
 	var classDialog = showDialog('classDialog',{
 		'autoOpen'  : false,
 		'width'     : 950,
-		'height'	: 700,
+		'height'	: 860,
 		'title' 	: LABELS.LESSON_EDIT_CLASS,
 		'resizable' : true,
 		'close' : function(){
 			loadTab();
 		}
 	}, false);
 	
-	$('.modal-body', classDialog).empty().append($('#classDialogContents').show()).closest('.modal-dialog').addClass('modal-lg');
+	$('.modal-body', classDialog).empty().append($('#classDialogContents').show()).closest('.modal-dialog').addClass('modal-xl');
 	
 	// search for users in the organisation with the term the Monitor entered
 	$('.dialogSearchPhrase', classDialog).autocomplete({
@@ -3125,4 +3125,4 @@
 function removeHTMLTags(string) {
  	var strTagStrippedText = string.replace(/<\/?[^>]+(>|$)/g, "");
  	return strTagStrippedText;
-}
\ No newline at end of file
+}
Index: lams_monitoring/web/monitor.jsp
===================================================================
diff -u -rdb0095c7ccb1a6c3bdbce14f3ca019ac106bc1e5 -rca8512dd8cc9ec8e34da6f0248304d5194e6e673
--- lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision db0095c7ccb1a6c3bdbce14f3ca019ac106bc1e5)
+++ lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision ca8512dd8cc9ec8e34da6f0248304d5194e6e673)
@@ -387,15 +387,6 @@
 					</label>
 				</div>
 				
-				<div class="navigate-btn-container">
-					<a id="timer-btn" class="btn btn-primary" href="<lams:LAMSURL/>monitoring/timer.jsp" target="_blank" 
-					   title="<fmt:message key='label.countdown.timer' />">
-						<i class="fa fa-hourglass-half fa-lg"></i>
-					</a>
-					<label for="timer-btn" class="d-none d-md-block">
-						<fmt:message key='label.countdown.timer' />
-					</label>
-				</div>
 			</div>
 			
 			<div class="lesson-properties">
@@ -512,9 +503,16 @@
 									<span class="hidden-xs"><fmt:message key="email.notifications"/></span>
 								</button>
 							</c:if>
+
+                            <a id="editTimerButton" class="btn btn-sm btn-primary"
+                                    type="button" href="<lams:LAMSURL/>monitoring/timer.jsp" target="_blank"
+                                    title='<fmt:message key="label.countdown.timer" />'>
+                                <i class="fa fa-hourglass-half"></i>
+                                <span class="hidden-xs"><fmt:message key="label.countdown.timer"/></span>
+                            </a>
 						</div>
 						
-						<div>
+						<div class="mt-2">
 							<c:if test="${lesson.enableLessonIntro}">
 								<button id="editIntroButton" class="btn btn-sm btn-primary"
 										type="button" onClick="javascript:showIntroductionDialog(${lesson.lessonID})">
@@ -940,4 +938,4 @@
   	</div>
 </div>
 </body>
-</lams:html>
\ No newline at end of file
+</lams:html>