diff --git a/web-resource/event_config.tmpl b/web-resource/event_config.tmpl
index 58c3ddb7..f99b0444 100755
--- a/web-resource/event_config.tmpl
+++ b/web-resource/event_config.tmpl
@@ -56,11 +56,13 @@
             <table class="table table-hover table-condensed">
                 <thead>
                 <th>Type</th>
+                <th>Date</th>
                 <th>Configuration</th>
                 </thead>
                 {{#detectedEvents}}
                 <tr>
                     <td>{{.getClass().getName()}}</td>
+                    <td>{{.getTimestamp()}}</td>
                     <td>{{.}}</td>
                     <td>
                         <div class="btn-toolbar pull-right">
@@ -116,6 +118,7 @@
             else{ // create
                 modal.find("input[name=action]").val("create_local_event");
                 modal.find("input[name=id]").val(-1);
+                modal.find("select[name=type]").change(); // Update dynamic inputs
             }
         });
     });
diff --git a/web-resource/event_overview.tmpl b/web-resource/event_overview.tmpl
index 0ed36b3f..bb76a9b1 100755
--- a/web-resource/event_overview.tmpl
+++ b/web-resource/event_overview.tmpl
@@ -18,7 +18,7 @@
                     <td><a href="?id={{.getId()}}">{{.getName()}}</a></td>
                     <td>{{.getDeviceData().getClass().getSimpleName()}}</td>
                     <td>{{.getDeviceData().getData()}}</td>
-                    <td>1 min ago</td>
+                    <td>{{.getDeviceData().getTimestamp()}}</td>
                     <td>
                         <form method="POST">
                             <input type="hidden" name="action" value="-">
diff --git a/web-resource/sensor_config.tmpl b/web-resource/sensor_config.tmpl
index 2b7e0e30..1cd7ea5c 100755
--- a/web-resource/sensor_config.tmpl
+++ b/web-resource/sensor_config.tmpl
@@ -59,11 +59,13 @@
             <table class="table table-hover table-condensed">
                 <thead>
                 <th>Type</th>
+                <th>Date</th>
                 <th>Configuration</th>
                 </thead>
                 {{#detectedSensors}}
                 <tr>
                     <td>{{.getClass().getName()}}</td>
+                    <td>{{.getTimestamp()}}</td>
                     <td>{{.}}</td>
                     <td>
                         <div class="btn-toolbar pull-right">
@@ -218,6 +220,7 @@
                 modal.find("input[name=action]").val("create_local_sensor");
                 modal.find("input[name=id]").val(-1);
                 modal.find("input[name=sync]").prop("checked", "false");
+                modal.find("select[name=type]").change(); // Update dynamic inputs
             }
         });
 
diff --git a/web-resource/sensor_overview.tmpl b/web-resource/sensor_overview.tmpl
index a080036b..e23c6866 100755
--- a/web-resource/sensor_overview.tmpl
+++ b/web-resource/sensor_overview.tmpl
@@ -17,7 +17,7 @@
                     <td><a href="?id={{.getId()}}">{{.getName()}}</a></td>
                     <td>{{.getDeviceData().getClass().getSimpleName()}}</td>
                     <td>{{.getDeviceData().getData()}}</td>
-                    <td>1 min ago</td>
+                    <td>{{.getDeviceData().getTimestamp()}}</td>
                 </tr>
                 {{/sensors}}
             </table>