diff --git a/puppetboard/static/coffeescript/tables.coffee b/puppetboard/static/coffeescript/tables.coffee
index 9b47f45..1155182 100644
--- a/puppetboard/static/coffeescript/tables.coffee
+++ b/puppetboard/static/coffeescript/tables.coffee
@@ -13,7 +13,7 @@ $('.facts').tablesorter(
 
 $('.dashboard').tablesorter(
     headers:
-        2:
+        3:
             sorter: false
     sortList: [[0, 1]]
 )
diff --git a/puppetboard/static/css/puppetboard.css b/puppetboard/static/css/puppetboard.css
index c8eeb7a..0e2444b 100644
--- a/puppetboard/static/css/puppetboard.css
+++ b/puppetboard/static/css/puppetboard.css
@@ -31,12 +31,13 @@ th.tablesorter-headerDesc::after {
 }
 
 .status {
-  width: 47%;
+  width: 47.5%;
   text-align: center;
   display: block;
 }
+
 .count {
-  width: 21%;
+  width: 14%;
   text-align: center;
   display: block;
 }
diff --git a/puppetboard/static/js/tables.js b/puppetboard/static/js/tables.js
index ccac257..df7673b 100644
--- a/puppetboard/static/js/tables.js
+++ b/puppetboard/static/js/tables.js
@@ -21,7 +21,9 @@
 
   $('.dashboard').tablesorter({
     headers: {
-        2: { sorter: false }
+      3: {
+        sorter: false
+      }
     },
     sortList: [[0, 1]]
   });
diff --git a/puppetboard/templates/index.html b/puppetboard/templates/index.html
index a7dec4e..dc76ea8 100644
--- a/puppetboard/templates/index.html
+++ b/puppetboard/templates/index.html
@@ -65,7 +65,8 @@
         <thead>
           <tr>
             <th class="five wide">Status</th>
-            <th class="ten wide">Hostname</th>
+            <th class="five wide">Hostname</th>
+            <th class="five wide">Report</th>
             <th class="one wide"></th>
           </tr>
         </thead>
@@ -88,19 +89,27 @@
                   {{node.status}}
                 </a>
                 {% if node.status=='unreported'%}
-                  <span class="ui small label status"> {{ node.unreported_time }} </label>
+                  <span class="ui small label status"> {{ node.unreported_time }} </span>
                 {% else %}
                    {% if node.events['failures'] %}<span class="ui small count label red">{{node.events['failures']}}</span>{% else %}<span class="ui small count label">0</span>{% endif%}
                    {% if node.events['successes'] %}<span class="ui small count label green">{{node.events['successes']}}</span>{% else %}<span class="ui small count label">0</span>{% endif%}
+                   {% if node.events['skips'] %}<span class="ui small count label orange">{{node.events['skips']}}</span>{% else %}<span class="ui small count label">0</span>{% endif%}
                 {% endif %}
             </td>
             <td>
               <a href="{{url_for('node', node_name=node.name)}}">{{ node.name }}</a>
             </td>
             <td>
-              <a title="Latest Report" href="{{url_for('report_latest', node_name=node.name)}}">
-                <i class="large tasks darkblue icon"></i>
-              </a>
+              {% if node.report_timestamp %}
+              <a href="{{url_for('report_latest', node_name=node.name)}}" rel='utctimestamp'>{{ node.report_timestamp }}</a>
+              {% else %}
+                <i class="large ban circle icon"></i>
+              {% endif %}
+            </td>
+            <td>
+              {% if node.report_timestamp %}
+              <a title='Reports' href="{{url_for('reports_node', node=node.name)}}"><i class='large darkblue book icon'></i></a>
+              {% endif %}
             </td>
           </tr>
           {% endif %}
diff --git a/puppetboard/templates/nodes.html b/puppetboard/templates/nodes.html
index 4bc2b68..14cc0cf 100644
--- a/puppetboard/templates/nodes.html
+++ b/puppetboard/templates/nodes.html
@@ -35,6 +35,7 @@
           {% else %}
           <span>{% if node.events['failures'] %}<span class="ui small count label red">{{node.events['failures']}}</span>{% else %}<span class="ui small count label">0</span>{% endif%}
             {% if node.events['successes'] %}<span class="ui small count label green">{{node.events['successes']}}</span>{% else %}<span class="ui small count label">0</span>{% endif%}</span>
+            {% if node.events['skips'] %}<span class="ui small count label yellow">{{node.events['skips']}}</span>{% else %}<span class="ui small count label">0</span>{% endif%}
           {% endif %}
       </td>
       <td><a href="{{url_for('node', node_name=node.name)}}">{{node.name}}</a></td>