diff --git a/src/Enum/CardBus.php b/src/Enum/CardBus.php
index bda6f6f..6de31c1 100644
--- a/src/Enum/CardBus.php
+++ b/src/Enum/CardBus.php
@@ -11,6 +11,9 @@ enum CardBus: string {
 	case PCIE_40_4 = 'PCIe 4.0 x4';
 	case PCIE_40_8 = 'PCIe 4.0 x8';
 	case PCIE_40_16 = 'PCIe 4.0 x16';
+	case PCIE_50_4 = 'PCIe 5.0 x4';
+	case PCIE_50_8 = 'PCIe 5.0 x8';
+	case PCIE_50_16 = 'PCIe 5.0 x16';
 
 	case PCI_33 = 'PCI 33';
 	case PCI_33V_33 = '3.3V PCI 33';
diff --git a/templates/computer-menu.html.twig b/templates/computer-menu.html.twig
index b863de8..abfcf62 100644
--- a/templates/computer-menu.html.twig
+++ b/templates/computer-menu.html.twig
@@ -1,30 +1,4 @@
 <div class="row expanded">
-	<ul class="menu">
-		<li class="not-implemented">
-			<a href="#">🖥️ Systems</a>
-		</li>
-	</ul>
-	<ul class="menu">
-		<li class="menu-text">Components</li>
-		<li class="{{ route starts with 'cpu_' ? 'is-active' }}">
-			<a href="{{ path('cpu_index') }}">🧠 CPUs</a>
-		</li>
-		<li class="{{ route starts with 'fpu_' ? 'is-active' }}">
-			<a href="{{ path('fpu_index') }}">🧮 FPUs</a>
-		</li>
-		<li class="{{ route starts with 'gpu_' ? 'is-active' }}">
-			<a href="{{ path('gpu_index') }}">🎮 GPUs</a>
-		</li>
-		<li class="not-implemented {{ route starts with 'motherboard_' ? 'is-active' }}">
-			<a href="/motherboard/">🤰 Motherboards</a>
-		</li>
-	</ul>
-	<ul class="menu">
-		<li class="menu-text">Previously Owned</li>
-		<li class="{{ route starts with 'previously-owned-gpu_' ? 'is-active' }}">
-			<a href="{{ path('previously-owned-gpu_index') }}">🎮 GPUs</a>
-		</li>
-	</ul>
 	<ul class="menu">
 		<li class="menu-text">Meta</li>
 		<li class="{{ route starts with 'brand_' ? 'is-active' }}">
@@ -43,4 +17,36 @@
 			<a href="{{ path('socket_index') }}">📍Sockets</a>
 		</li>
 	</ul>
+	<!-- <ul class="menu">
+		<li class="not-implemented">
+			<a href="#">🖥️ Systems</a>
+		</li>
+	</ul> -->
+	<ul class="menu">
+		<li class="menu-text">Components</li>
+		<li class="{{ route starts with 'cpu_' ? 'is-active' }}">
+			<a href="{{ path('cpu_index') }}">🧠 CPUs</a>
+		</li>
+		<li class="{{ route starts with 'fpu_' ? 'is-active' }}">
+			<a href="{{ path('fpu_index') }}">🧮 FPUs</a>
+		</li>
+		<li class="{{ route starts with 'gpu_' ? 'is-active' }}">
+			<a href="{{ path('gpu_index') }}">🎮 GPUs</a>
+		</li>
+		<li class="not-implemented {{ route starts with 'motherboard_' ? 'is-active' }}">
+			<a href="/motherboard/">🤰 Motherboards</a>
+		</li>
+	</ul>
+	<ul class="menu">
+		<li class="menu-text">Previously Owned</li>
+		<li class="not-implemented {{  route starts with 'previously-owned-cpu_' ? 'is-active' }}">
+			<a href="#">🧠 CPUs</a>
+		</li>
+		<li class="not-implemented {{  route starts with 'previously-owned-fpu_' ? 'is-active' }}">
+			<a href="#">🧮 FPUs</a>
+		</li>
+		<li class="{{ route starts with 'previously-owned-gpu_' ? 'is-active' }}">
+			<a href="{{ path('previously-owned-gpu_index') }}">🎮 GPUs</a>
+		</li>
+	</ul>
 </div>
diff --git a/templates/gpu/index.html.twig b/templates/gpu/index.html.twig
index 52fe73d..400223a 100644
--- a/templates/gpu/index.html.twig
+++ b/templates/gpu/index.html.twig
@@ -54,14 +54,14 @@
 					<th>GPU</th>
 					<th>Card Brand</th>
 					<th>Alternate Model Name</th>
-					<th>Card Keying</th>
-					<th>Bus Interface</th>
+					<th>Count</th>
+					<th>Key / Bus</th>
 					<th>Slot Width</th>
 					<th>Power</th>
 					<th>Tdp</th>
-					<th>GPU Clock</th>
+					<th data-tsorter="numeric">GPU Clock</th>
 					<th>Memory</th>
-					<th>Shading Units</th>
+					<!-- <th>Shading Units</th>
 					<th>TMUs</th>
 					<th>ROPs</th>
 					<th>Compute Units</th>
@@ -71,9 +71,9 @@
 					<th>OpenGL</th>
 					<th>OpenCL</th>
 					<th>Vulkan</th>
-					<th>Shader Model</th>
+					<th>Shader Model</th> -->
 					<th>Link</th>
-					<th>Count</th>
+
 					<th>Notes</th>
 				</tr>
 				</thead>
@@ -103,8 +103,8 @@
 						</td>
 						<td>{% if gpu.boardBrand %}{{ gpu.boardBrand.name }}{% else %}Unknown{% endif %}</td>
 						<td>{{ gpu.alternateModelName }}</td>
-						<td>{{ gpu.cardKey.value }}</td>
-						<td>{{ gpu.busInterface.value }}</td>
+						<td>{{ gpu.count }}</td>
+						<td>{{ gpu.cardKey.value }} / {{ gpu.busInterface.value }}</td>
 						<td>{{ gpu.slotSpan }}</td>
 						<td>
 							{% if gpu.pcie6power > 0 or gpu.pcie8power > 0 %}
@@ -129,7 +129,7 @@
 							{% endif %}
 						</td>
 						<td>{{ gpu.memorySize }}MiB {{ gpu.memoryClock }}MHz {{ gpu.memoryBus }}bit {{ gpu.memoryType }}</td>
-						<td>{{ gpu.shadingUnits }}</td>
+						<!-- <td>{{ gpu.shadingUnits }}</td>
 						<td>{{ gpu.tmus }}</td>
 						<td>{{ gpu.rops }}</td>
 						<td>{{ gpu.computeUnits }}</td>
@@ -139,9 +139,9 @@
 						<td>{{ gpu.openGLSupport }}</td>
 						<td>{{ gpu.openCLSupport }}</td>
 						<td>{{ gpu.vulkanSupport }}</td>
-						<td>{{ gpu.shaderModel }}</td>
+						<td>{{ gpu.shaderModel }}</td> -->
 						<td>{{ gpu.link }}</td>
-						<td>{{ gpu.count }}</td>
+
 						<td>{{ gpu.notes }}</td>
 					</tr>
 				{% else %}
diff --git a/templates/photo-menu.html.twig b/templates/photo-menu.html.twig
index d226f56..63c3814 100644
--- a/templates/photo-menu.html.twig
+++ b/templates/photo-menu.html.twig
@@ -1,4 +1,15 @@
 <div class="row expanded">
+	<div class="column">
+		<ul class="menu">
+			<li class="menu-text">Meta</li>
+			<li class="{{ route starts with 'film_' ? 'is-active' }}">
+				<a href="{{ path('film_index') }}">🎞️ Film</a>
+			</li>
+			<li class="{{ route starts with 'camera-type_' ? 'is-active' }}">
+				<a href="{{ path('camera-type_index') }}">🎥 Camera Types</a>
+			</li>
+		</ul>
+	</div>
 	<div class="column">
 		<ul class="menu">
 			<li class="menu-text">Currently Owned</li>
@@ -27,15 +38,4 @@
 			</li>
 		</ul>
 	</div>
-	<div class="column">
-		<ul class="menu">
-			<li class="menu-text">Meta</li>
-			<li class="{{ route starts with 'film_' ? 'is-active' }}">
-				<a href="{{ path('film_index') }}">🎞️ Film</a>
-			</li>
-			<li class="{{ route starts with 'camera-type_' ? 'is-active' }}">
-				<a href="{{ path('camera-type_index') }}">🎥 Camera Types</a>
-			</li>
-		</ul>
-	</div>
 </div>