diff --git a/hw_diag/templates/thix_dashboard.html b/hw_diag/templates/thix_dashboard.html
index 2be56e0b..51db7f55 100644
--- a/hw_diag/templates/thix_dashboard.html
+++ b/hw_diag/templates/thix_dashboard.html
@@ -14,23 +14,31 @@ <h3 class="text-center mb-4">ThingsIX Configuration</h3>
               <table class="table dt-responsive nowrap m-md-2 w-auto">
                 <tr>
                     <td><i class="uil uil-sign-alt"></i> Gateway Address</td>
+                    {% if not gateway.gatewayId %}
+                    <td class="text-right">Not Available</td>
+                    {% else %}
                     <td class="text-right">
                       <a target="_blank" href="https://app.thingsix.com/gateways/{{ gateway.gatewayId }}"><span class="badge badge-light p-2">{{ gateway.gatewayId }}</span></a>
                     </td>
+                    {% endif %}
                 </tr>
                 <tr>
                     <td class="border-0"><i class="uil uil-wallet"></i> Gateway Owner</td>
+                    {% if not gateway.owner %}
+                    <td class="text-right border-0">Not Available</td>
+                    {% else %}
                     <td class="text-right border-0">
                       <a target="_blank" href="https://mumbai.polygonscan.com/address/{{ gateway.owner }}"><span class="badge badge-light p-2">{{ gateway.owner }}</span></a>
                     </td>
+                    {% endif %}
                 </tr>
                 <tr>
                   {% if not gateway.gatewayId %}
-                    <td><i class="fak fa-thingsix"></i> Explorer Link</td>
-                    <td class="text-right">Not Available</td>
+                    <td class="border-0"><i class="fak fa-thingsix"></i> Explorer Link</td>
+                    <td class="text-right border-0">Not Available</td>
                   {% else %}
-                    <td><i class="fak fa-thingsix"></i> Explorer Link</td>
-                    <td class="text-right">
+                    <td class="border-0"><i class="fak fa-thingsix"></i> Explorer Link</td>
+                    <td class="text-right border-0">
                       <a target="_blank" href="https://app.thingsix.com/gateways/{{ gateway.gatewayId }}">View on Explorer</a>
                     </td>
                   {% endif %}
@@ -62,26 +70,26 @@ <h3 class="text-center mb-4">ThingsIX Configuration</h3>
                     {% endif %}
                 </tr>
                 <tr>
-                    <td>Antenna Gain</td>
-                    <td>
+                    <td class="border-0"><span class="uil uil-signal icon"></span> Antenna Gain</td>
                         {% if gateway.details %}
-                            {{ gateway.details.antennaGain }}dBi
-                        {% else %}
-                            Onboard Pending
-                        {% endif %}
-                    </td>
+                        <td class="border-0 text-right">
+                          <span class="badge badge-light p-2">{{ gateway.details.antennaGain }} dBi</span>
+                        </td>
+                    {% else %}
+                        <td class="border-0 text-right">Onboard Pending</td>
+                    {% endif %}
                 </tr>
                 <tr>
-                    <td class="border-0">Antenna Altitude</td>
-                    <td class="border-0">
+                    <td class="border-0"><span class="uil uil-top-arrow-to-top"></span> Antenna Altitude</td>
                         {% if gateway.details %}
-                        <span class="badge badge-light p-2">
-                            {{ gateway.details.altitude }}m
-                        </span>
+                        <td class="border-0 text-right">
+                            <span class="badge badge-light p-2">
+                                {{ gateway.details.altitude }} m
+                            </span>
+                        </td>
                         {% else %}
-                            Onboard Pending
+                            <td class="border-0 text-right">Onboard Pending</td>
                         {% endif %}
-                    </td>
                 </tr>
               </table>
             </div>
@@ -112,5 +120,12 @@ <h3 class="text-center mb-4">ThingsIX Configuration</h3>
             </div>
           </div>
         </div>
+        <div class="text-center">
+          {% if diagnostics.last_updated %}
+            <p>Last Updated: {{ diagnostics.last_updated }}</p>
+          {% else %}
+            <p>Last Updated: Never</p>
+          {% endif %}
+      </div>
     </div>
 {% endblock %}