diff --git a/src/bottom-panel-no-overhang.scad b/src/bottom-panel-inset.scad
similarity index 89%
rename from src/bottom-panel-no-overhang.scad
rename to src/bottom-panel-inset.scad
index 43fbaa0..4483044 100644
--- a/src/bottom-panel-no-overhang.scad
+++ b/src/bottom-panel-inset.scad
@@ -21,7 +21,7 @@ include <components.scad>
 module bottom_panel() {
 	difference() {
 		mirror([0, 0, 1]) topplate();
-		translate([0, 0, top_plate_z/2]) cube([top_plate_x*5/6, top_plate_y*5/6, top_plate_z], center=true);
+		translate([0, 0, top_plate_z/2]) cube([top_plate_x-40, top_plate_y-40, top_plate_z], center=true);
 	}
 }
 
diff --git a/src/bottom-panel-solo.scad b/src/bottom-panel-solo.scad
index e94d056..cac179e 100644
--- a/src/bottom-panel-solo.scad
+++ b/src/bottom-panel-solo.scad
@@ -21,7 +21,7 @@ include <components.scad>
 module bottom_panel_solo() {
 	difference() {
 		bottom_plate_with_overhang();
-		translate([0, 0, top_plate_z/2]) cube([top_plate_x*5/6, top_plate_y*5/6, top_plate_z], center=true);
+		translate([0, 0, top_plate_z/2]) cube([top_plate_x-40, top_plate_y-40, top_plate_z], center=true);
 	}
 }
 
diff --git a/src/components.scad b/src/components.scad
index d9db042..7e75bab 100644
--- a/src/components.scad
+++ b/src/components.scad
@@ -258,7 +258,7 @@ module topplate() {
 
 module bottom_plate_with_overhang() {
 	difference() {
-		overhang_plate();
+		rotate([180, 0, 0]) base_top_plate_with_raised_overhang();
 		rotate([180, 0, 0]) top_plate_holes();
 	}
 }
@@ -313,6 +313,7 @@ module frame() {
 	difference() {
 		base_frame();
 		translate([0, 0, frame_z/2]) scale([1, 1, 2]) base_topplate();
+		translate([0, 0, -frame_z/2]) scale([1, 1, 2]) base_topplate();
 		translate([plate_to_frame_point_x, plate_to_frame_point_y, 0]) frame_hex_bolt_hole();
 		translate([-plate_to_frame_point_x, plate_to_frame_point_y, 0]) frame_hex_bolt_hole();
 		translate([plate_to_frame_point_x, -plate_to_frame_point_y, 0]) frame_hex_bolt_hole();
diff --git a/src/frame-left.scad b/src/frame-left.scad
index 5f286ea..9eba693 100644
--- a/src/frame-left.scad
+++ b/src/frame-left.scad
@@ -30,10 +30,10 @@ module left_frame() {
 	difference() {
 		base_left_frame();
 		// connection holes to other frames
-		translate([0, 0, -top_plate_z/2]) frame_connection_holes();
+		frame_connection_holes();
 
 		// cable routing hole
-		translate([0, 0, -top_plate_z/2]) frame_cable_routing_hole();
+		frame_cable_routing_hole();
 
 		// aux button holes
 		translate([-30, 101.5, 0]) rotate([270, 0, 0]) button_24mm_hole();
diff --git a/src/frame-middle.scad b/src/frame-middle.scad
index 0c45c18..dfeb7a1 100644
--- a/src/frame-middle.scad
+++ b/src/frame-middle.scad
@@ -31,12 +31,12 @@ module middle_frame() {
 	difference() {
 		base_middle_frame();
 		// connection holes to other frames
-		translate([0, 0, -top_plate_z/2]) frame_connection_holes();
-		translate([0, 0, -top_plate_z/2]) mirror([1, 0, 0]) frame_connection_holes();
+		frame_connection_holes();
+		mirror([1, 0, 0]) frame_connection_holes();
 
 		// cable routing holes
-		translate([0, 0, -top_plate_z/2]) frame_cable_routing_hole();
-		translate([0, 0, -top_plate_z/2]) mirror([1, 0, 0]) frame_cable_routing_hole();
+		frame_cable_routing_hole();
+		mirror([1, 0, 0]) frame_cable_routing_hole();
 
 		// neutrik mounts for connector, switches
 		translate([0, (frame_y/2)-neutrik_panel_thickness, 0]) rotate([90, 0, 0]) neutrik_d_mount();
diff --git a/src/frame-right.scad b/src/frame-right.scad
index 49de451..60c2a41 100644
--- a/src/frame-right.scad
+++ b/src/frame-right.scad
@@ -30,10 +30,10 @@ module right_frame() {
 	difference() {
 		base_right_frame();
 		// connection holes to other frames
-		mirror([1, 0, 0]) translate([0, 0, -top_plate_z/2]) frame_connection_holes();
+		mirror([1, 0, 0]) frame_connection_holes();
 
 		// cable routing hole
-		mirror([1, 0, 0]) translate([0, 0, -top_plate_z/2]) frame_cable_routing_hole();
+		mirror([1, 0, 0]) frame_cable_routing_hole();
 
 		// aux button holes
 		translate([30, 101.5, 0]) rotate([270, 0, 0]) button_24mm_hole();