diff --git a/index.html b/index.html
index 18b74cd..47d7050 100644
--- a/index.html
+++ b/index.html
@@ -18,18 +18,18 @@
 
             <div class="row">
 
-                <div class="col-md-4 logo">
+                <div class="col-sm-4 logo">
                     Level2
                 </div>
 
-                <div class="col-md-4 datetime">
+                <div class="col-sm-4 datetime">
 
                     <h1 class="time"></h1>
                     <h3 class="date"></h3>
 
                 </div>
 
-                <div class="col-md-4 weather">
+                <div class="col-sm-4 weather">
 
                     <div class="row">
                         <div class="col-xs-6">
diff --git a/js/level2.js b/js/level2.js
index c234b4d..89cf49b 100644
--- a/js/level2.js
+++ b/js/level2.js
@@ -26,7 +26,7 @@
 
 function refreshTime() {
 
-    $('.time').text( moment().format('h:mm') );
+    $('.time').text( moment().format('HH:mm') );
     $('.date').text( moment().format('MMMM Do YYYY') );
 
 }
@@ -76,11 +76,11 @@ function refreshContent() {
 
             timeLeftMessage = 'departure in ' + timeDifference + 'minutes';
 
-            if ( timeDifference <= 5 ) {
+            if ( timeDifference <= 5 && timeDifference > -1 ) {
 
                 labelColor = "danger";
 
-            } else if ( timeDifference <= 10) {
+            } else if ( timeDifference <= 10 && timeDifference > -1 ) {
 
                 labelColor = "warning";