diff --git a/src/components.scad b/src/components.scad
index c8abef4..9b3d1c7 100644
--- a/src/components.scad
+++ b/src/components.scad
@@ -307,7 +307,7 @@ module dir_arc_24mm_8_button_compressed() {
 // Directional Arc (left hand)
 
 module dir_arc_30mm_button_l() {
-	translate([68, 132, 0]) button_30mm_hole_for_snapins();
+	translate([-top_plate_x/2, -top_plate_y/2, 0]) translate([68, 132, 0]) button_30mm_hole_for_snapins();
 }
 
 module dir_arc_w_30mm() {
@@ -316,7 +316,7 @@ module dir_arc_w_30mm() {
 	translate([35+33.5, -12.9, 0]) dir_arc_30mm_button_l();
 	translate([35+7, 34.5, 0]) dir_arc_30mm_button_l();
 	// just my guesstimate on this one, but note that this is the same position as sega 2p (just mirrored)
-	translate([top_plate_x-33.06, 145-19-9-11-19-9-11, 0]) button_30mm_hole_for_snapins();
+	translate([-top_plate_x/2, -top_plate_y/2, 0]) translate([top_plate_x-33.06, 145-19-9-11-19-9-11, 0]) button_30mm_hole_for_snapins();
 }
 
 module dir_arc_w_30mm_plus_one() {
@@ -327,7 +327,7 @@ module dir_arc_w_30mm_plus_one() {
 // Namco Noir (right hand)
 
 module noir_button_p1() {
-	translate([40, 145, 0]) button_30mm_hole_for_snapins();
+	translate([-top_plate_x/2, -top_plate_y/2, 0]) translate([40, 145, 0]) button_30mm_hole_for_snapins();
 }
 
 module noir_plus_one() {
@@ -348,7 +348,7 @@ module noir_plus_one() {
 // Sega Astro City 2P (right hand)
 
 module sega_2p_p1() {
-	translate([33.06, 145, 0]) button_30mm_hole_for_snapins();
+	translate([-top_plate_x/2, -top_plate_y/2, 0]) translate([33.06, 145, 0]) button_30mm_hole_for_snapins();
 }
 
 module sega_2p_plus_one() {
diff --git a/src/top-panel-dir_arc-plus-w-30mm-plus-one-with-mount.scad b/src/top-panel-dir_arc-plus-w-30mm-plus-one-with-mount.scad
index 94c1e61..501d745 100644
--- a/src/top-panel-dir_arc-plus-w-30mm-plus-one-with-mount.scad
+++ b/src/top-panel-dir_arc-plus-w-30mm-plus-one-with-mount.scad
@@ -21,7 +21,7 @@ use <top-panel-dir_arc-plus-w-30mm-plus-one.scad>
 
 module dir_arc_w_30mm_plus_one_panel_with_mount() {
 	dir_arc_w_30mm_plus_one_panel();
-	translate([65, 55, -(top_plate_z/2) - 3]) pcb_mount();
+	translate([-15, -40, -(top_plate_z/2) - 3]) rotate([0, 0, -15]) pcb_mount();
 }
 
 dir_arc_w_30mm_plus_one_panel_with_mount();
diff --git a/src/top-panel-dir_arc-plus-w-30mm-plus-one.scad b/src/top-panel-dir_arc-plus-w-30mm-plus-one.scad
index ae4afec..6e2f9fc 100644
--- a/src/top-panel-dir_arc-plus-w-30mm-plus-one.scad
+++ b/src/top-panel-dir_arc-plus-w-30mm-plus-one.scad
@@ -20,7 +20,7 @@ include <components.scad>
 
 module dir_arc_w_30mm_plus_one_panel() {
 	difference() {
-		translate([top_plate_x/2, top_plate_y/2, 0]) topplate();
+		topplate();
 		dir_arc_w_30mm_plus_one();
 	}
 }
diff --git a/src/top-panel-namco-noir-plus-one.scad b/src/top-panel-namco-noir-plus-one.scad
index 5a3db07..f585fcc 100644
--- a/src/top-panel-namco-noir-plus-one.scad
+++ b/src/top-panel-namco-noir-plus-one.scad
@@ -20,7 +20,7 @@ include <components.scad>
 
 module namco_noir_plus_one_panel() {
 	difference() {
-		translate([top_plate_x/2, top_plate_y/2, 0]) topplate();
+		topplate();
 		noir_plus_one();
 	}
 }
diff --git a/src/top-panel-namco-noir-plus-two.scad b/src/top-panel-namco-noir-plus-two.scad
index 75a3aa1..d775b31 100644
--- a/src/top-panel-namco-noir-plus-two.scad
+++ b/src/top-panel-namco-noir-plus-two.scad
@@ -20,7 +20,7 @@ include <components.scad>
 
 module namco_noir_plus_two_panel() {
 	difference() {
-		translate([top_plate_x/2, top_plate_y/2, 0]) topplate();
+		topplate();
 		noir_plus_one();
 		translate([32.94-3.47-3.47, -78+7.37+4.49, 0]) noir_button_p1();
 	}
diff --git a/src/top-panel-sega-2p-plus-one.scad b/src/top-panel-sega-2p-plus-one.scad
index 99ed01a..657b0be 100644
--- a/src/top-panel-sega-2p-plus-one.scad
+++ b/src/top-panel-sega-2p-plus-one.scad
@@ -20,7 +20,7 @@ include <components.scad>
 
 module sega_2p_plus_one_panel() {
 	difference() {
-		translate([top_plate_x/2, top_plate_y/2, 0]) topplate();
+		topplate();
 		sega_2p_plus_one();
 	}
 }