diff --git a/public_html/index.html b/public_html/index.html
index c418987..295e0f2 100644
--- a/public_html/index.html
+++ b/public_html/index.html
@@ -53,6 +53,7 @@
 				<img src="images/ff-sv-logo.png" alt="FlightFeeder SkyView" class="adsbLogo flightfeederLogo" srcset="images/ff-sv-logo.png 1x, images/ff-sv-logo@2x.png 2x, images/ff-sv-logo@3x.png 3x" style="display: none;">
 			</div>
 			<div class="buttonContainer">
+				<div class="dateTime" id="clock_div"></div>
 				<div class="button" onclick="resetMap();"><span class="buttonText">Reset Map</span></div>
 				<div class="button" onclick="selectAllPlanes();"><span class="buttonText">Select All</span></div>
 				<div class="button" onclick="deselectAllPlanes();"><span class="buttonText">Select None</span></div>
diff --git a/public_html/script.js b/public_html/script.js
index 88b4ed4..afc123e 100644
--- a/public_html/script.js
+++ b/public_html/script.js
@@ -193,35 +193,7 @@ function initialize() {
 
         PlaneRowTemplate = document.getElementById("plane_row_template");
 
-        if (!ShowClocks) {
-                $('#timestamps').css('display','none');
-        } else {
-                // Create the clocks.
-		new CoolClock({
-			canvasId:       "utcclock",
-			skinId:         "classic",
-			displayRadius:  40,
-			showSecondHand: true,
-			gmtOffset:      "0", // this has to be a string!
-			showDigital:    false,
-			logClock:       false,
-			logClockRev:    false
-		});
-
-		ReceiverClock = new CoolClock({
-			canvasId:       "receiverclock",
-			skinId:         "classic",
-			displayRadius:  40,
-			showSecondHand: true,
-			gmtOffset:      null,
-			showDigital:    false,
-			logClock:       false,
-			logClockRev:    false
-		});
-
-                // disable ticking on the receiver clock, we will update it ourselves
-                ReceiverClock.tick = (function(){})
-        }
+        refreshClock();
 
         $("#loader").removeClass("hidden");
         
@@ -916,6 +888,11 @@ function refreshHighlighted() {
 
 }
 
+function refreshClock() {
+	$('#clock_div').text(new Date().toLocaleString());
+	var c = setTimeout(refreshClock, 500);
+}
+
 function removeHighlight() {
 	HighlightedPlane = null;
 	refreshHighlighted();
diff --git a/public_html/style.css b/public_html/style.css
index 9ba0ce3..494e5ef 100644
--- a/public_html/style.css
+++ b/public_html/style.css
@@ -315,6 +315,10 @@ select.error, textarea.error, input.error {
     line-height: 18px;
     color: #FFFFFF;
     color: rgb(255, 255, 255);
+    line-height: 60px;
+    text-align: right;
+    display: inline-block;
+    padding-right: 20px;
 }
 
 .infoHeading