diff --git a/views/default.hbs b/views/default.hbs
index 1a05307..512e66a 100644
--- a/views/default.hbs
+++ b/views/default.hbs
@@ -17,7 +17,7 @@
 <body class="container-fluid">
     
     <div style="background:#D1E0E0" class="jumbotron">
-        <h1 class="text-center">Device Dashboard</h1>
+        <h1 class="text-center">Alert Monitor Dashboard</h1>
     </div>
 
     {{! Everything else gets inserted here }}
diff --git a/views/index.hbs b/views/index.hbs
index dc50c61..1bcc3b2 100644
--- a/views/index.hbs
+++ b/views/index.hbs
@@ -1,16 +1,31 @@
 {{!< default}}
 
 <h1>Select a monitor device:</h1>
-<ul>
-    {{#each cores}}
-        <li>
-            <a href="https://particle.kaplon.us/core/{{this.coreId}}">
-                {{#if this.coreName}}
-                    {{this.coreName}}, {{this.locationDesc}}, {{this.MaxPub}}, {{this.MaxStatus}}
-                {{else}}
-                    {{this.coreId}}, {{this.locationDesc}}, {{this.MaxPub}}, {{this.MaxStatus}}
-                {{/if}}
-            </a>
-        </li>
-    {{/each}}
-</ul>
+<table class="table table-striped">
+    <thead>
+        <tr>
+            <th>Device Name</th>
+            <th>Location</th>
+            <th>Last Update</th>
+            <th></th>
+        </tr>
+    </thead>
+    <tbody>
+        {{#each cores}}
+            <tr>
+                <td>
+                    <a href="https://particle.kaplon.us/core/{{this.coreId}}">
+                        {{#if this.coreName}}
+                            {{this.coreName}}                        
+                        {{else}}
+                            {{this.coreId}}
+                        {{/if}}
+                    </a>
+                </td>
+                <td>{{this.locationDesc}}</td>
+                <td>{{this.MaxPub}}</td>
+                <td>{{this.MaxStatus}}</td>
+            </tr>
+        {{/each}}
+    </tbody>
+</table>
