diff --git a/cad/display.scad b/cad/display.scad
index 2ce29b5..8ac68a2 100644
--- a/cad/display.scad
+++ b/cad/display.scad
@@ -24,37 +24,49 @@ translate([thinkness, thinkness, 1.5]){
   }
 }
 
-// mount supports
-translate([31+thinkness, 0, 10])
-  mount_support();
+// usb floor
+usb_floor();
 
-translate([145+thinkness, 0, 12])
-  mount_support();
+// battery floor
+battery_floor(145);
 
-// usb floor support
-translate([0, (depth+(thinkness*2))/2-5, height])
-  cube([32.6, 10, thinkness]);
+module usb_floor(){
+  offset=5.6+thinkness;
+  hole=6;
 
-translate([31, (depth+(thinkness*2))/2-5, height])
-  cube([thinkness, 10, 3.6]);
+  difference([]){
+    translate([0, 0, height])
+      cube([31+thinkness+10, depth+(thinkness*2), 2+thinkness]);
 
-module mount_support(){
-    hole=6;
-    offset=5.6+thinkness;
-    width=10;
+    translate([0, 0, height+thinkness])
+      cube([31, depth+(thinkness*2), 2+thinkness]);
 
-    translate([0, 0, -4])
-      cube([10, thinkness, 4]);
+    translate([31+thinkness, thinkness, height])
+      cube([10, depth, 2]);
 
-    translate([0, depth+thinkness, -4])
-      cube([10, thinkness, 4]);
+    translate([31+thinkness+5, offset, height+2])
+      cylinder(h=thinkness, d=hole);
 
-    difference(){
-      cube([width, depth+(thinkness*2), thinkness]);
-      translate([width/2, offset, 0])
-        cylinder(h=thinkness, d=hole);
-      translate([width/2, depth+(thinkness*2)-offset, 0])
-        cylinder(h=thinkness, d=hole);
-    }
+    translate([31+thinkness+5, depth+(thinkness*2)-offset, height+2])
+      cylinder(h=thinkness, d=hole);
+  }
 }
 
+module battery_floor(x){
+    offset=5.6+thinkness;
+    hole=6;
+
+    difference(){
+      translate([x+thinkness, 0, height])
+        cube([width-x+thinkness, depth+(thinkness*2), 4+thinkness]);
+
+      translate([x+thinkness, thinkness, height])
+        cube([width-x, depth, 4]);
+
+      translate([x+thinkness+5, offset, height+4])
+        cylinder(h=thinkness, d=hole);
+
+      translate([x+thinkness+5, depth+(thinkness*2)-offset, height+4])
+        cylinder(h=thinkness, d=hole);
+    }
+}
\ No newline at end of file