diff --git a/succbone/succd/index.html b/succbone/succd/index.html
index e12c73a..08acab3 100644
--- a/succbone/succd/index.html
+++ b/succbone/succd/index.html
@@ -10,6 +10,10 @@ body {
 }
 table {
     font-size: 40px;
+    margin-top: 1em;
+}
+table.status td {
+    width: 2em;
 }
 th, td {
     background-color: #e8e8e8;
@@ -58,50 +62,66 @@ td > span {
 <p style="margin-top: 2em; clear: both;">
     <table>
         <tr>
+            <th rowspan="2">Pirani Gauge</th>
             <th>Voltage</th>
-            <td id="volts" colspan="4">{{ .Pirani.Volts }}</td>
+            <td id="volts">{{ .Pirani.Volts }}</td>
         </tr>
         <tr>
             <th>Pressure</th>
-            <td id="mbar" colspan="4">{{ .Pirani.Mbar }}</td>
+            <td id="mbar">{{ .Pirani.Mbar }}</td>
         </tr>
+    </table>
+
+    <table class="status">
         <tr>
             <th>Thresholds</th>
-            <td>Rough:</td>
+            <th>Rough</th>
             <td id="trough">{{ if .Feedback.RoughReached }}OK{{ else }}NOK{{ end }}</td>
-            <td>High:</td>
+            <th>High</th>
             <td id="thigh">{{ if .Feedback.HighReached }}OK{{ else }}NOK{{ end }}</td>
         </tr>
         <tr>
             <th>Pumps</th>
-            <td>RP:</td>
+            <th>RP</th>
             <td id="rp">{{ if .Pumps.RPOn }}ON{{ else }}OFF{{ end }}</td>
-            <td>DP:</td>
+            <th>DP</th>
             <td id="dp">{{ if .Pumps.DPOn }}ON{{ else }}OFF{{ end }}</td>
         </tr>
         <tr>
-            <th>Evac Control</th>
-            <td colspan="4">
+            <th>Safety</th>
+            <th style="font-size: 0.7em;">Pirani<br />Failsafe</th>
+            <td id="failsafe">{{ if .Safety.Failsafe }}ON{{ else }}OFF{{ end }}</td>
+            <th style="font-size: 0.7em;">DP<br />Lockout</th>
+            <td id="highpressure">{{ if .Safety.HighPressure }}ON{{ else }}OFF{{ end }}</td>
+        </tr>
+    </table>
+
+    <table>
+        <tr>
+            <th rowspan="3">Control</th>
+            <th>RP</th>
+            <td>
+                <button id="rpon">On</button>
+                <button id="rpoff">Off</button>
+            </td>
+        </tr>
+        <tr>
+            <th>DP</th>
+            <td>
+                <button id="dpon">On</button>
+                <button id="dpoff">Off</button>
+            </td>
+        </tr>
+        <tr>
+            <td colspan="2">
                 <button id="pd">Pump Down</button>
                 <button id="vent">Vent</button>
-                <button id="rpon">RP On</button>
-                <button id="rpoff">RP Off</button>
-                <button id="dpon">DP On</button>
-                <button id="dpoff">DP Off</button>
             </td>
         </tr>
         <tr>
             <th>Status</th>
             <td id="status" colspan="4">OK</td>
         </tr>
-        <tr>
-            <th>Failsafe</th>
-            <td id="failsafe" colspan="4">{{ if .Safety.Failsafe }}ON{{ else }}OFF{{ end }}</td>
-        </tr>
-        <tr>
-            <th>Diffusion Pump Lockout</th>
-            <td id="highpressure" colspan="4">{{ if .Safety.HighPressure }}ON{{ else }}OFF{{ end }}</td>
-        </tr>
     </table>
 </p>
 <p style="margin-top: 2em;">