diff --git a/glance-system/glance-kisfenyo.yaml b/glance-system/glance-kisfenyo.yaml
index cf55f1a..230cf36 100644
--- a/glance-system/glance-kisfenyo.yaml
+++ b/glance-system/glance-kisfenyo.yaml
@@ -74,7 +74,7 @@ data:
                   uptime:
                     url: ${PROMETHEUS_URL}/api/v1/query
                     parameters:
-                      query: node_boot_time_seconds
+                      query: time() - node_boot_time_seconds
                   cpu:
                     url: ${PROMETHEUS_URL}/api/v1/query
                     parameters:
@@ -196,9 +196,9 @@ data:
                   
                   {{ $hostname := .JSON.String "data.result.0.metric.nodename" }}
                   {{ $bootTime := (.Subrequest "uptime").JSON.Float "data.result.0.value.1" }}
-                  {{ $uptimeSec := sub now.Unix (int64 $bootTime) }}
-                  {{ $uptimeDays := div $uptimeSec 86400 }}
-                  {{ $uptimeHours := div (mod $uptimeSec 86400) 3600 }}
+                  {{ $uptimeSec := (.Subrequest "uptime_seconds").JSON.Float "data.result.0.value.1" }}
+                  {{ $uptimeDays := div $uptimeSec 86400.0 }}
+                  {{ $uptimeHours := div (mod $uptimeSec 86400.0) 3600.0 }}
                   {{ $cpu := (.Subrequest "cpu").JSON.Float "data.result.0.value.1" }}
                   {{ $mem := (.Subrequest "memory").JSON.Float "data.result.0.value.1" }}
                   {{ $temp := (.Subrequest "cpu_temp").JSON.Float "data.result.0.value.1" }}
@@ -212,7 +212,7 @@ data:
                       </div>
                       <div class="top-item">
                         <div class="top-label">Uptime</div>
-                        <div class="top-value">{{ $uptimeDays }}d {{ $uptimeHours }}h</div>
+                        <div class="top-value">{{ printf "%.0f" $uptimeDays }}d {{ printf "%.0f" $uptimeHours }}h</div>
                       </div>
                       <div class="top-item">
                         <div class="top-label">CPU</div>
diff --git a/glance-system/glance-orsi.yaml b/glance-system/glance-orsi.yaml
index f531a3b..5e441b9 100644
--- a/glance-system/glance-orsi.yaml
+++ b/glance-system/glance-orsi.yaml
@@ -151,11 +151,10 @@ data:
                 title: Recent Notes
 
           # ---------- RIGHT COLUMN ----------
-          - type: to-do
-            title: Tasks
-
           - size: small
             widgets:
+              - type: to-do
+                title: Tasks
               # RSS Feeds - Add your favorite feeds here
               - type: rss
                 title: News & Feeds