diff --git a/hal-core/resources/web/event_detail.tmpl b/hal-core/resources/web/event_detail.tmpl
index 91451ac5..e1466f0d 100644
--- a/hal-core/resources/web/event_detail.tmpl
+++ b/hal-core/resources/web/event_detail.tmpl
@@ -57,7 +57,7 @@
             <table class="table table-hover table-condensed">
                 <thead>
                     <th class="col-md-6">Timestamp</th>
-                    <th class="col-md-2">Data</th>
+                    <th class="col-md-2">Raw Data</th>
                 </thead>
                 {{#history}}
                 <tr>
diff --git a/hal-core/resources/web/event_overview.tmpl b/hal-core/resources/web/event_overview.tmpl
index fe600e7a..130250a6 100644
--- a/hal-core/resources/web/event_overview.tmpl
+++ b/hal-core/resources/web/event_overview.tmpl
@@ -56,7 +56,7 @@
                     if (row.dataset.deviceId != deviceData.id || row.dataset.timestamp != deviceData.data?.timestamp) {
                         // Only update if data has changed
                         row.dataset.deviceId = deviceData.id;
-                        row.cells[0].innerHTML = deviceData.name;
+                        row.cells[0].innerHTML = "<a href='?id=" + deviceData.id + "'>" + deviceData.name + "</a>";
                         row.cells[1].innerHTML = deviceData.config?.typeConfig;
                         row.cells[2].innerHTML = deviceData.data?.valueStr;
 
diff --git a/hal-core/resources/web/sensor_detail.tmpl b/hal-core/resources/web/sensor_detail.tmpl
index f6979784..a7368ff8 100644
--- a/hal-core/resources/web/sensor_detail.tmpl
+++ b/hal-core/resources/web/sensor_detail.tmpl
@@ -57,7 +57,7 @@
                 <table class="table table-hover table-condensed">
                     <thead>
                         <th class="col-md-6">Timestamp</th>
-                        <th class="col-md-2">Data</th>
+                        <th class="col-md-2">Raw Data</th>
                     </thead>
                     {{#history}}
                     <tr>