diff --git a/static/modules/system.js b/static/modules/system.js
index e4cb098583869ee9cdbcf624d3fbb8af27431d79..3e6bf88b189435accaa3cf88d8af391f9f206343 100644
--- a/static/modules/system.js
+++ b/static/modules/system.js
@@ -98,11 +98,14 @@ class System {
                 let now = new Date();
                 let t = now - power_up;
                 console.log(t);
+                let seconds =  Math.round(t/1000, 0);
                 let minutes = Math.round(t/1000/60, 0);
-                if (minutes < 240) {
+                if (minutes < 1) {
+                    uptime_display.innerHTML = `on for ${seconds} s`;
+                } else if (minutes < 240) {
                     uptime_display.innerHTML = `on for ${minutes} min`;
                 } else {
-                    let hours = Math.round(minutes/60, 1);
+                    let hours = Math.round(t/1000/60/60, 1);
                     uptime_display.innerHTML = `on for ${hours} h`;
                 }
                 
diff --git a/static/style.css b/static/style.css
index a9ecde7c9248298d346de7943a5cfe47e32f3330..765495fd74c9974e44a4c382297c944ee41f55d7 100644
--- a/static/style.css
+++ b/static/style.css
@@ -30,6 +30,10 @@ main {
 	padding-top: 0.3em;
 }
 
+.hidden {
+	display: none;
+}
+
 header {
 	width: 100%;
 	border-bottom: 1px solid white;