diff --git a/enclosure/fabula_enclosure.scad b/enclosure/fabula_enclosure.scad
index 58a195b..8dadf98 100644
--- a/enclosure/fabula_enclosure.scad
+++ b/enclosure/fabula_enclosure.scad
@@ -45,10 +45,10 @@ module fabula_enclosure_top() {
             box();
             
             // Supports
-            translate([-66.1, 30.1, -16.2]) pcb_support(pcb_screw_size);
-            translate([-66.1, -27.8, -16.2]) pcb_support(pcb_screw_size);
-            translate([64.1, 24.2, -16.2]) pcb_support(pcb_screw_size);
-            translate([64.1, -26.8, -16.2]) pcb_support(pcb_screw_size);
+            translate([-66.1, 30.1, -14.5]) pcb_support(pcb_screw_size);
+            translate([-66.1, -27.8, -14.5]) pcb_support(pcb_screw_size);
+            translate([64.1, 24.2, -14.5]) pcb_support(pcb_screw_size);
+            translate([64.1, -26.8, -14.5]) pcb_support(pcb_screw_size);
             
             // Url
             //translate([-80, -42, -22.5]) linear_extrude(height = 1.5, center = true) text("git.ichibi.eu/penguin86/Fabula", size = 6);
diff --git a/enclosure/supports.scad b/enclosure/supports.scad
index ff20010..b192f08 100644
--- a/enclosure/supports.scad
+++ b/enclosure/supports.scad
@@ -23,8 +23,8 @@ module supports_charging_module() {
 
 module pcb_support(screw_diameter) {
     difference() {
-        cylinder(d = 10, h = 17.6, center = true);
-        cylinder(d = screw_diameter, h = 18, center = true);
+        cylinder(d = 10, h = 19, center = true);
+        cylinder(d = screw_diameter, h = 21, center = true);
     }
 }    
 
diff --git a/enclosure/test_fit.scad b/enclosure/test_fit.scad
index 61ce478..77a40c5 100644
--- a/enclosure/test_fit.scad
+++ b/enclosure/test_fit.scad
@@ -3,7 +3,7 @@
 use <internal_components.scad>
 use <fabula_enclosure.scad>
 use <keys.scad>
-use <character_retainer_ring.scad>
+use <external_parts.scad>
 
 explode_view = false;
 
@@ -16,16 +16,16 @@ color_top = "#ffad00";
 module test_fit_components() {
     // Internal components
     translate([0, 30, 0]) speaker_80();
-    translate([0, 0, 26]) pcb();
+    translate([0, 0, 24.5]) pcb();
     translate([0, -28, 9]) rotate([0, 90, 0]) battery_18650();
     
     // Components that require cutout on external shell
     translate([-29, -71.5, 1]) rotate([0, 0, 90]) li_ion_4056_charger_module();
     color("#000") translate([-5, -92, 10]) rotate([90, 0, 0]) switch();
-    color(color_buttons_vol) translate([-13.4, -20.1, 43]) vol_up_keycap();
-    color(color_buttons_track) translate([12.6, -35.6, 43]) next_keycap();
-    color(color_buttons_track) translate([-23.4, -44.6, 43]) prev_keycap();
-    color(color_buttons_vol) translate([2.05, -61.05, 43]) vol_down_keycap();
+    color(color_buttons_vol) translate([-13.4, -20.1, 41.5]) vol_up_keycap();
+    color(color_buttons_track) translate([12.6, -35.6, 41.5]) next_keycap();
+    color(color_buttons_track) translate([-23.4, -44.6, 41.5]) prev_keycap();
+    color(color_buttons_vol) translate([2.05, -61.05, 41.5]) vol_down_keycap();
     
     // Components mounted on the external shell
     color("#fff") translate([0, 50, 45]) character_retainer_ring();
@@ -34,5 +34,5 @@ module test_fit_components() {
 }
 
 test_fit_components();
-color(color_bottom) translate([0, 0, explode_view ? -20 : 20]) rotate([0, 0, -90]) rotate([180, 0, 0]) fabula_enclosure_bottom();
+//color(color_bottom) translate([0, 0, explode_view ? -20 : 20]) rotate([0, 0, -90]) rotate([180, 0, 0]) fabula_enclosure_bottom();
 color(color_top) translate([0, 0, explode_view ? 100 : 21]) rotate([0, 0, -90]) rotate([180, 0, 0]) fabula_enclosure_top();