diff --git a/puppetboard/static/css/puppetboard.css b/puppetboard/static/css/puppetboard.css
index 9ae384648..c90a68785 100644
--- a/puppetboard/static/css/puppetboard.css
+++ b/puppetboard/static/css/puppetboard.css
@@ -23,6 +23,11 @@ h1.ui.header.no-margin-bottom {
   display: block;
 }
 
+td.reports_links {
+  display: flex;
+  justify-content: space-between;
+}
+
 .ui.table[class*="very compact"] td {
   padding: 0.15em 0.1em;
   max-width: 320px;
diff --git a/puppetboard/templates/index.html b/puppetboard/templates/index.html
index 2e201fd29..341a68e66 100644
--- a/puppetboard/templates/index.html
+++ b/puppetboard/templates/index.html
@@ -87,10 +87,9 @@ <h2>Nodes, except with status unchanged ({{nodes|length}})</h2>
       <table class='ui sortable very compact very basic table'>
         <thead>
           <tr>
-            <th class="five wide">Status</th>
-            <th class="five wide">Certname</th>
-            <th class="date five wide default-sort">Report</th>
-            <th class="one wide"></th>
+            <th class="four wide">Status</th>
+            <th class="eight wide">Certname</th>
+            <th class="four wide default-sort">Report (last / all)</th>
           </tr>
         </thead>
         <tbody>
@@ -107,18 +106,14 @@ <h2>Nodes, except with status unchanged ({{nodes|length}})</h2>
             <td>
               <a href="{{url_for('node', env=current_env, node_name=node.name)}}">{{ node.name }}</a>
             </td>
-            <td>
+            <td class="reports_links">
               {% if node.report_timestamp %}
                 <a href="{{url_for('report', env=current_env, node_name=node.name, report_id=node.latest_report_hash)}}" rel='utctimestamp'>{{ node.report_timestamp }}</a>
+                <a title='Reports' href="{{url_for('reports', env=current_env, node_name=node.name)}}"><i class='large darkblue book icon'></i></a>
               {% else %}
                 <i class="large ban icon"></i>
               {% endif %}
             </td>
-            <td>
-              {% if node.report_timestamp %}
-              <a title='Reports' href="{{url_for('reports', env=current_env, node_name=node.name)}}"><i class='large darkblue book icon'></i></a>
-              {% endif %}
-            </td>
           </tr>
           {% endif %}
           {% endfor %}
diff --git a/puppetboard/templates/nodes.html b/puppetboard/templates/nodes.html
index 530100519..e75236f3e 100644
--- a/puppetboard/templates/nodes.html
+++ b/puppetboard/templates/nodes.html
@@ -7,11 +7,10 @@
 <table class='ui very compact very basic sortable table'>
   <thead>
     <tr>
-      <th>Status</th>
-      <th class="default">Certname</th>
-      <th class="date default-sort">Catalog</th>
-      <th class="date">Report</th>
-      <th>&nbsp;</th>
+      <th class="four wide">Status</th>
+      <th class="eight wide">Certname</th>
+      <th class="two wide date default-sort">Catalog</th>
+      <th class="two wide date">Report (last / all)</th>
     </tr>
   </thead>
   <tbody class="searchable">
@@ -26,18 +25,14 @@
       </td>
       <td><a href="{{url_for('node', env=current_env, node_name=node.name)}}">{{node.name}}</a></td>
       <td><a rel="utctimestamp" href="{{url_for('catalog_node', env=current_env, node_name=node.name)}}">{{node.catalog_timestamp}}</a></td>
-      <td>
+      <td class="reports_links">
         {% if node.report_timestamp %}
           <a href="{{url_for('report', env=current_env, node_name=node.name, report_id=node.latest_report_hash)}}" rel='utctimestamp'>{{ node.report_timestamp }}</a>
+          <a title='Reports' href="{{url_for('reports', env=current_env, node_name=node.name)}}"><i class='large darkblue book icon'></i></a>
         {% else %}
           <i class="large darkblue ban icon"></i>
         {% endif %}
       </td>
-      <td>
-        {% if node.report_timestamp %}
-        <a title='Reports' href="{{url_for('reports', env=current_env, node_name=node.name)}}"><i class='large darkblue book icon'></i></a>
-        {% endif %}
-      </td>
     </tr>
     {% endfor %}
   </tbody>