diff --git a/web-resource/event_detail.tmpl b/web-resource/event_detail.tmpl
index e0729ff0..4ace90ae 100755
--- a/web-resource/event_detail.tmpl
+++ b/web-resource/event_detail.tmpl
@@ -1,6 +1,26 @@
 <h1 class="page-header">Details for <a href="#">{{event.getName()}}</a></h1>
 
-<div class="col-md-12">
+<div class="col-md-5">
+    <div class="panel panel-default drop-shadow">
+        <div class="panel-heading">Configuration</div>
+        <div class="panel-body">
+            <table class="table table-hover table-condensed">
+                <thead>
+                <tr>
+                    <th class="text-right">Name:</th>
+                    <td>{{event.getName()}}</td>
+                </tr>
+                </thead>
+                <tr>
+                    <th class="text-right">Type:</th>
+                    <td>{{event.getDeviceData().getClass().getSimpleName()}}</td>
+                </tr>
+            </table>
+        </div>
+    </div>
+</div>
+
+<div class="col-md-7">
     <div class="panel panel-default drop-shadow">
         <div class="panel-heading">History data</div>
         <div class="panel-body">
@@ -13,7 +33,7 @@
                 {{#history}}
                 <tr>
                     <td>{{.timestamp}}</a></td>
-                    <td>{{.data()}}</td>
+                    <td>{{.data}}</td>
                 </tr>
                 {{/history}}
             </table>
diff --git a/web-resource/event_overview.tmpl b/web-resource/event_overview.tmpl
index 45d29648..0ed36b3f 100755
--- a/web-resource/event_overview.tmpl
+++ b/web-resource/event_overview.tmpl
@@ -7,16 +7,18 @@
 
             <table class="table table-hover table-condensed">
                 <thead>
-                    <th class="col-md-5">Name</th>
-                    <th class="col-md-3">Data</th>
-                    <th class="col-md-3">Last Update</th>
-                    <th class="col-md-1">Actions</th>
+                    <th class="col-md-4">Name</th>
+                    <th class="col-md-3">Type</th>
+                    <th class="col-md-2">Data</th>
+                    <th class="col-md-2">Last Update</th>
+                    <th class="col-md-1 text-right">Actions</th>
                 </thead>
                 {{#events}}
                 <tr>
                     <td><a href="?id={{.getId()}}">{{.getName()}}</a></td>
-                    <td>{{.getData()}}</td>
-                    <td>updated 1 min ago</td>
+                    <td>{{.getDeviceData().getClass().getSimpleName()}}</td>
+                    <td>{{.getDeviceData().getData()}}</td>
+                    <td>1 min ago</td>
                     <td>
                         <form method="POST">
                             <input type="hidden" name="action" value="-">