Index: lams_monitoring/web/css/_tblmonitor_base.scss
===================================================================
diff -u -rc6128af11f25424ef2818bc7bc86d825ccbbf845 -r216bba4f8a64f7cc1941c8e81aa878668aa04aba
--- lams_monitoring/web/css/_tblmonitor_base.scss	(.../_tblmonitor_base.scss)	(revision c6128af11f25424ef2818bc7bc86d825ccbbf845)
+++ lams_monitoring/web/css/_tblmonitor_base.scss	(.../_tblmonitor_base.scss)	(revision 216bba4f8a64f7cc1941c8e81aa878668aa04aba)
@@ -56,10 +56,6 @@
     border-radius: 0 0 6px 6px;
 }
 
-#refresh-button {
-	margin-right: 15px;
-}
-
 /* Sidebar Styles */
 
 table.tablesorter {
@@ -156,10 +152,21 @@
     background: none;
 }
 
+.top-nav {
+	padding: 0 10px 0 15px;
+	display: flex;
+    justify-content: space-between;
+}
+
 .top-nav div {
     padding-top: 13px;
 }
 
+.top-nav #menu-right-controls {
+	min-width: 100px;
+}
+	
+	
 @media(min-width:768px) {
     #wrapper {
         padding-left: 154px;
@@ -180,7 +187,11 @@
     #wrapper.toggled #page-content-wrapper {
         margin-right: 0;
     }
-   
+
+    .top-nav #menu-right-controls {
+	    min-width: 400px;
+	}
+	
    .top-nav div {
 	    padding-top: 20px;
 	}
Index: lams_monitoring/web/tblmonitor/tblmonitor.jsp
===================================================================
diff -u -r403a0da00fe43c0d695b3f86c50fd891c34a735d -r216bba4f8a64f7cc1941c8e81aa878668aa04aba
--- lams_monitoring/web/tblmonitor/tblmonitor.jsp	(.../tblmonitor.jsp)	(revision 403a0da00fe43c0d695b3f86c50fd891c34a735d)
+++ lams_monitoring/web/tblmonitor/tblmonitor.jsp	(.../tblmonitor.jsp)	(revision 216bba4f8a64f7cc1941c8e81aa878668aa04aba)
@@ -315,13 +315,13 @@
 	        </div>
 	    </nav>
 		<!-- /Offcanvas Bar -->
-    
-    		<!-- Page Content -->
+		
+    	<!-- Page Content -->
 		<div id="page-content-wrapper">
 
 			<!-- Top bar -->
 			<div class="top-nav">
-				<div class="col-xs-9 col-md-7 col-lg-7" id="menu-left-controls">
+				<div id="menu-left-controls">
 					<a href="#">
 						<i class="fa fa-bars fa-lg" id="menu-toggle-bars"></i>
 					</a>
@@ -330,18 +330,16 @@
 					</span>
 				</div>
 						
-				<div>
-					<button id="regular-monitor-button" type="button" class="btn btn-sm btn-default pull-right" onclick="return switchToRegularMonitor();" style="margin-right: 10px;">
-						<i class="fa fa-heartbeat" title="<fmt:message key="label.monitor" />"></i><span class="hidden-xs">  <fmt:message key="label.switch.to.regular.monitor" /></span>
-					</button>
-					
-					<button id="refresh-button" type="button" class="btn btn-sm btn-default pull-right" onclick="Javascript: refresh(); return false;" style="margin-right: 10px;">
+				<div id="menu-right-controls">
+					<button id="timer-button" type="button" class="btn btn-sm btn-default"  onclick="javascript:openPopUp('<lams:LAMSURL/>monitoring/timer.jsp', '<fmt:message key="label.countdown.timer"/>', 648, 1152, true);return false;">
+							<i class="fa fa-hourglass-half"></i><span class="hidden-xs"> <fmt:message key="label.countdown.timer"/></span>
+					</button>	
+					<button id="refresh-button" type="button" class="btn btn-sm btn-default" onclick="Javascript: refresh(); return false;">
 						<i class="fa fa-refresh"></i><span class="hidden-xs">  <fmt:message key="button.refresh"/></span>
 					</button>
-					
-					<button id="timer-button" type="button" class="btn btn-sm btn-default pull-right"  onclick="javascript:openPopUp('<lams:LAMSURL/>monitoring/timer.jsp', '<fmt:message key="label.countdown.timer"/>', 648, 1152, true);return false;" style="margin-right: 10px;">
-							<i class="fa fa-hourglass-half"></i><span class="hidden-xs"> <fmt:message key="label.countdown.timer"/></span>
-					</button>		
+					<button id="regular-monitor-button" type="button" class="btn btn-sm btn-default" onclick="return switchToRegularMonitor();">
+						<i class="fa fa-heartbeat" title="<fmt:message key="label.monitor" />"></i><span class="hidden-xs">  <fmt:message key="label.switch.to.regular.monitor" /></span>
+					</button>
 				</div>
 			</div>
 			<!-- End top bar -->