diff --git a/static/style.css b/static/style.css
index 6c2619c..e3a97eb 100644
--- a/static/style.css
+++ b/static/style.css
@@ -91,17 +91,14 @@ th, td { padding: 0.4em 0.7em; text-align: left; border-bottom: 1px solid var(--
 th { background: var(--surface); font-weight: 600; }
 
 /* RACK LAYOUT */
-.rack-layout { display: flex; gap: 2em; margin: 1em 0; }
-.rack-panel { flex: 1; }
-.rack-panel h3 { margin-top: 0; }
-.rack-slot {
-    display: flex; align-items: center; gap: 0.5em;
-    padding: 1px 0.4em; border-bottom: 1px solid #222;
-    font-size: 0.85em;
-}
-.rack-slot.occupied { background: var(--surface); }
-.unit-num { color: var(--text-muted); width: 2em; text-align: right; font-size: 0.75em; flex-shrink: 0; }
-.rack-device { display: flex; flex-direction: column; }
+.rack-table { width: 100%; border-collapse: collapse; margin: 1em 0; }
+.rack-table th { background: var(--surface); font-weight: 600; padding: 0.3em 0.6em; text-align: center; }
+.rack-table td { padding: 0; border-bottom: 1px solid #222; vertical-align: top; }
+.rack-table .unit-num { color: var(--text-muted); width: 2.5em; text-align: center; font-size: 0.75em; vertical-align: middle; }
+.rack-table .rack-cell { width: 45%; padding: 2px 0.4em; }
+.rack-table tr.device-start td { border-top: 2px solid #444; }
+.rack-table tr.device-start td.rack-cell { background: var(--surface); }
+.rack-device { display: flex; flex-direction: column; padding: 0.15em 0; }
 .rack-device strong { font-size: 0.9em; }
 .rack-device small { font-size: 0.75em; }
 
diff --git a/templates/rack.html b/templates/rack.html
index 84bc03d..7154b7e 100644
--- a/templates/rack.html
+++ b/templates/rack.html
@@ -20,37 +20,34 @@
     </details>
 </div>
 
-<div class="rack-layout">
-    <div class="rack-panel">
-        <h3>Front</h3>
-        {{range .FrontSlots}}
-        <div class="rack-slot {{if .Device}}occupied{{end}}" style="{{if .IsStart}}border-top:2px solid #444;{{end}} min-height:28px;">
-            <span class="unit-num">{{.Unit}}</span>
-            {{if .IsStart}}
-            <div class="rack-device">
-                <a href="/devices/{{.Device.ID}}"><strong>{{.Device.Name}}</strong></a>
-                {{if .Device.Model}}<small>{{.Device.Model.Manufacturer}} {{.Device.Model.Name}} ({{.Height}}U)</small>{{end}}
-                {{if .Device.UsageDescription}}<small>{{.Device.UsageDescription}}</small>{{end}}
-            </div>
-            {{end}}
+<table class="rack-table">
+<thead><tr><th>U</th><th>Front</th><th>U</th><th>Back</th></tr></thead>
+<tbody>
+{{range $i, $fs := .FrontSlots}}
+<tr {{if or $fs.IsStart (index $.BackSlots $i).IsStart}}class="device-start"{{end}}>
+    <td class="unit-num">{{$fs.Unit}}</td>
+    <td class="rack-cell">
+        {{if $fs.IsStart}}
+        <div class="rack-device">
+            <a href="/devices/{{$fs.Device.ID}}"><strong>{{$fs.Device.Name}}</strong></a>
+            {{if $fs.Device.Model}}<small>{{$fs.Device.Model.Manufacturer}} {{$fs.Device.Model.Name}} ({{$fs.Height}}U)</small>{{end}}
+            {{if $fs.Device.UsageDescription}}<small>{{$fs.Device.UsageDescription}}</small>{{end}}
         </div>
         {{end}}
-    </div>
-    <div class="rack-panel">
-        <h3>Back</h3>
-        {{range .BackSlots}}
-        <div class="rack-slot {{if .Device}}occupied{{end}}" style="{{if .IsStart}}border-top:2px solid #444;{{end}} min-height:28px;">
-            <span class="unit-num">{{.Unit}}</span>
-            {{if .IsStart}}
-            <div class="rack-device">
-                <a href="/devices/{{.Device.ID}}"><strong>{{.Device.Name}}</strong></a>
-                {{if .Device.Model}}<small>{{.Device.Model.Manufacturer}} {{.Device.Model.Name}} ({{.Height}}U)</small>{{end}}
-            </div>
-            {{end}}
+    </td>
+    <td class="unit-num">{{(index $.BackSlots $i).Unit}}</td>
+    <td class="rack-cell">
+        {{if (index $.BackSlots $i).IsStart}}
+        <div class="rack-device">
+            <a href="/devices/{{(index $.BackSlots $i).Device.ID}}"><strong>{{(index $.BackSlots $i).Device.Name}}</strong></a>
+            {{if (index $.BackSlots $i).Device.Model}}<small>{{(index $.BackSlots $i).Device.Model.Manufacturer}} {{(index $.BackSlots $i).Device.Model.Name}} ({{(index $.BackSlots $i).Height}}U)</small>{{end}}
         </div>
         {{end}}
-    </div>
-</div>
+    </td>
+</tr>
+{{end}}
+</tbody>
+</table>
 
 <h3>Devices &amp; Ports</h3>
 {{range .RackedDevices}}