Index: lams_monitoring/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rf4621cf27d17389c7437daf00f3c2b833290ca5a -r8ecd468196ce6f79783ec375bc9f92c7d38579e2
--- lams_monitoring/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f4621cf27d17389c7437daf00f3c2b833290ca5a)
+++ lams_monitoring/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8ecd468196ce6f79783ec375bc9f92c7d38579e2)
@@ -218,11 +218,11 @@
 button.schedule.tooltip  =Schedule lesson to start in a future time
 button.start.now  =Start Now
 button.start.now.tooltip  =Start the lesson immediately
-lesson.enable.presence  =Allow learners to see who is online
+lesson.presence =Presence
 lesson.enable.presence.alert  =Now learners can see who is online
 lesson.disable.presence.alert  =Now learners can not see who is online
 lesson.presence.count =users
-lesson.enable.im  =Enable Instant Messaging
+lesson.im =Instant Messaging
 lesson.enable.im.alert  =Instant Messaging is now enabled
 lesson.disable.im.alert  =Instant Messaging is now disabled
 lesson.required.tasks  =Required tasks
Index: lams_monitoring/web/css/monitorLesson.css
===================================================================
diff -u -r36e474218e1201198ba926e57e56c7a885db1a9f -r8ecd468196ce6f79783ec375bc9f92c7d38579e2
--- lams_monitoring/web/css/monitorLesson.css	(.../monitorLesson.css)	(revision 36e474218e1201198ba926e57e56c7a885db1a9f)
+++ lams_monitoring/web/css/monitorLesson.css	(.../monitorLesson.css)	(revision 8ecd468196ce6f79783ec375bc9f92c7d38579e2)
@@ -12,6 +12,10 @@
 	margin-top: 30%;
 }
 
+dd {
+	margin-bottom: 10px;
+}
+
 #content {
 	width: 100%;
 	padding: 0;
@@ -28,6 +32,11 @@
 	padding-bottom: 0;
 }
 
+#content .navbar-collapse {
+	padding-left: 0;
+}
+
+
 .errorMessage {
 	font-weight: bold;
 	color: red;
Index: lams_monitoring/web/includes/javascript/monitorLesson.js
===================================================================
diff -u -r36e474218e1201198ba926e57e56c7a885db1a9f -r8ecd468196ce6f79783ec375bc9f92c7d38579e2
--- lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision 36e474218e1201198ba926e57e56c7a885db1a9f)
+++ lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision 8ecd468196ce6f79783ec375bc9f92c7d38579e2)
@@ -100,8 +100,8 @@
  */
 function initLessonTab(){
 	// sets presence availability
-	$('#presenceAvailableField').change(function(){
-		var checked = $(this).is(':checked');
+	$('#presenceButton').click(function(){
+		var checked = $(this).toggleClass('btn-success').hasClass('btn-success');
 		$.ajax({
 			dataType : 'xml',
 			url : LAMS_URL + 'monitoring/monitoring.do',
@@ -115,24 +115,19 @@
 				updatePresenceAvailableCount();
 				
 				if (checked) {
-					$('#imAvailableField').attr('disabled', null);
-					$('#imDiv').css('display','inline');
+					$('#imButton').show();
 					alert(LABELS.LESSON_PRESENCE_ENABLE_ALERT);
 				} else {
-					$('#imAvailableField').attr({
-						'checked'  : null,
-						'disabled' : 'disabled'
-					}).change();
-					$('#imDiv').css('display','none');
+					$('#imButton').removeClass('btn-success').hide();
 					alert(LABELS.LESSON_PRESENCE_DISABLE_ALERT);
 				}
 			}
 		});
 	});
 	
 	// sets instant messaging availability
-	$('#imAvailableField').change(function(){
-		var checked = $(this).is(':checked');
+	$('#imButton').click(function(){
+		var checked = $(this).toggleClass('btn-success').hasClass('btn-success');
 		$.ajax({
 			dataType : 'xml',
 			url : LAMS_URL + 'monitoring/monitoring.do',
@@ -144,14 +139,10 @@
 			},
 			success : function() {
 				if (checked) {
-					$('#openImButton').css('display', 'inline');
-					$('#imButton').attr('class','btn btn-xs btn-success voffset10');
-					$('#imDiv').css('display','inline');
+					$('#openImButton').show();
 					alert(LABELS.LESSON_IM_ENABLE_ALERT);
 				} else {
-					$('#openImButton').css('display', 'none');
-					$('#imButton').attr('class','btn btn-xs btn-default voffset10');
-					$('#imDiv').css('display','none');
+					$('#openImButton').hide();
 					alert(LABELS.LESSON_IM_DISABLE_ALERT);
 				}
 			}
@@ -499,10 +490,8 @@
 
 
 function updatePresenceAvailableCount(){
-	var checked = $('#presenceAvailableField').is(':checked'),
-		counter = $('#presenceAvailableCount');
-		presenceButton = $('#presenceButton');
-		presenceCounter = $('#presenceCounter');
+	var checked = $('#presenceButton').hasClass('btn-success'),
+		counter = $('#presenceCounter');
 	if (checked) {
 		$.ajax({
 			dataType : 'text',
@@ -513,17 +502,10 @@
 				'lessonID'      : lessonId
 			},
 			success : function(result) {
-				$('span', counter).text(result);
-				presenceCounter.text(result);
-				presenceButton.attr('class', 'btn btn-xs btn-success');
-				presenceCounter.show();
-				counter.show();
+				counter.text(result).show();
 			}
 		});
-
 	} else {
-		presenceCounter.hide();
-		presenceButton.attr('class', 'btn btn-xs btn-default');
 		counter.hide();
 	}
 }
Index: lams_monitoring/web/monitor.jsp
===================================================================
diff -u -r36e474218e1201198ba926e57e56c7a885db1a9f -r8ecd468196ce6f79783ec375bc9f92c7d38579e2
--- lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision 36e474218e1201198ba926e57e56c7a885db1a9f)
+++ lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision 8ecd468196ce6f79783ec375bc9f92c7d38579e2)
@@ -175,10 +175,10 @@
 			initLearnersTab();
 			refreshMonitor();
 			<c:if test="${not empty lesson.lessonDescription}">
-			$('#description').readmore({
-					  speed: 500,
-					  collapsedHeight: 85
-			});
+				$('#description').readmore({
+						  speed: 500,
+						  collapsedHeight: 85
+				});
 			</c:if>
 			
 			// remove "loading..." screen
@@ -290,22 +290,17 @@
 									</dd>
 								</c:if>
 								<!--  lesson actions -->
-								<style>
-										dd { 
-										  margin-bottom: 10px;
-										}
-								</style>
 								<dt><fmt:message key="lesson.manage"/>:</dt>
 								<dd>
 									<div class="btn-group btn-group-xs" role="group" id="lessonActions">
-									  <button id="viewLearnersButton" class="btn btn-sm btn-default roffset10" 
-									  	type="button" class="btn btn-xs btn-default" onClick="javascript:showLessonLearnersDialog()"
+									  <button id="viewLearnersButton" class="btn btn-default roffset10" 
+									  	type="button"onClick="javascript:showLessonLearnersDialog()"
 									  	title='<fmt:message key="button.view.learners.tooltip"/>'><i class="fa fa-sm fa-users"></i> <span class="hidden-xs"><fmt:message key="button.view.learners"/></span></button>
-									  <button id="editClassButton" class="btn btn-sm btn-default roffset10" 
-									  	type="button" class="btn btn-xs btn-default" onClick="javascript:showClassDialog()" 
+									  <button id="editClassButton" class="btn btn-default roffset10" 
+									  	type="button" onClick="javascript:showClassDialog()" 
 									  	title='<fmt:message key="button.edit.class.tooltip"/>'><i class="fa fa-sm fa-user-times"></i> <span class="hidden-xs"><fmt:message key="button.edit.class"/></span></button>
 									<c:if test="${notificationsAvailable && lesson.enabledLessonNotifications}">	
-									  <button id="notificationButton" class="btn btn-sm btn-default roffset10"
+									  <button id="notificationButton" class="btn btn-default" 
 									  	type="button" onClick="javascript:window.parent.showNotificationsDialog(null,${lesson.lessonID})"><i class="fa fa-sm fa-bullhorn"></i> <span class="hidden-xs"><fmt:message key="email.notifications"/></span></button>
 									</c:if>							  
 									</div>
@@ -314,27 +309,31 @@
 								<!-- IM & Presence -->
 								<dt>Instant messaging:</dt>
 								<dd>
-									<div id="presenceDiv">
-									<button id="presenceButton" class="btn btn-xs btn-danger"><i class="fa fa-wifi"></i> <span class="hidden-xs">Presence</span> 
-										<span id="presenceCounter" class="badge">0</span>
-									</button>
-									</div>							
-									<div id="imDiv"
-										<c:if test="${not lesson.learnerPresenceAvailable}">
-											style="display: none"
-										</c:if>
-										<c:if test="${lesson.learnerImAvailable}">
-											style="display: inline"
-										</c:if> 
-										>
-									<button id="imButton" class="btn btn-xs btn-default voffset10"><i id="imButtonToggle" class="fa fa-comments-o"></i> <span class="hidden-xs">Instant messaging</span></button>
+									<div class="btn-group btn-group-xs" role="group">
+										<button id="presenceButton" class="btn btn-default roffset10
+											<c:if test="${lesson.learnerPresenceAvailable}">
+												btn-success
+											</c:if>
+											"><i class="fa fa-sm fa-wifi"></i> <span class="hidden-xs">Presence</span> 
+											<span id="presenceCounter" class="badge">0</span>
+										</button>
+	
+										<button id="imButton" class="btn btn-default
+											<c:if test="${lesson.learnerImAvailable}">
+												btn-success
+											</c:if>
+											"
+											<c:if test="${not lesson.learnerPresenceAvailable}">
+												style="display: none"
+											</c:if>
+										><i class="fa fa-sm fa-comments-o"></i> <span class="hidden-xs">Instant messaging</span></button>
 									</div>
 								</dd>
 							</dl>	
 						</div>
 						
 						
-						<div class="col-sm-3  col-xs-6">
+						<div class="col-sm-3 col-xs-6">
 							<div class="panel panel-default">
 								<div class="panel-heading">Overall Completion
 								</div>
@@ -363,31 +362,6 @@
 					</div>
 				
 					<table id="tabLessonTable" class="table table-striped">
-						<tr>
-							<td>
-							</td>
-							<td>
-								<input type="checkbox" id="presenceAvailableField"
-									<c:if test="${lesson.learnerPresenceAvailable}">
-										checked="checked"
-									</c:if> 
-								/>
-								<fmt:message key="lesson.enable.presence"/>
-								<span id="presenceAvailableCount">(<span>0</span>
-									<fmt:message key="lesson.presence.count"/>)
-								</span>
-								<br />
-								<input type="checkbox" id="imAvailableField"
-									<c:if test="${not lesson.learnerPresenceAvailable}">
-										disabled="disabled"
-									</c:if>
-									<c:if test="${lesson.learnerImAvailable}">
-										checked="checked"
-									</c:if> 
-								/>
-								<fmt:message key="lesson.enable.im"/>
-							</td>
-						</tr>
 						<tr id="contributeHeader">
 							<td colspan="2" class="active">
 								<fmt:message key="lesson.required.tasks"/>