diff --git a/bc832-ftdi/bc832-nrf-ftdi-fab-interior.png b/bc832-ftdi/bc832-nrf-ftdi-fab-interior.png
index 171ce7fc4dc5669c5db79ff7075467ec610d554d..3d15d273a5963b01a4165f1cd0ba8da725b1caf8 100644
Binary files a/bc832-ftdi/bc832-nrf-ftdi-fab-interior.png and b/bc832-ftdi/bc832-nrf-ftdi-fab-interior.png differ
diff --git a/bc832-ftdi/bc832-nrf-ftdi-fab-layout.png b/bc832-ftdi/bc832-nrf-ftdi-fab-layout.png
index 280211109fcc422a665bb4b612f8f81aa2ddbf0a..cca271e7e1af4f2a015f5a3e28d9f8bfc02675ba 100644
Binary files a/bc832-ftdi/bc832-nrf-ftdi-fab-layout.png and b/bc832-ftdi/bc832-nrf-ftdi-fab-layout.png differ
diff --git a/bc832-ftdi/bc832-nrf-ftdi-fab-traces.png b/bc832-ftdi/bc832-nrf-ftdi-fab-traces.png
index bd8c9250065a6c709b224b409a7d5e769105ac97..e292c820ee783b04c65e08b71904f613ffd739e9 100644
Binary files a/bc832-ftdi/bc832-nrf-ftdi-fab-traces.png and b/bc832-ftdi/bc832-nrf-ftdi-fab-traces.png differ
diff --git a/bc832-ftdi/bc832-nrf-ftdi-fab.ko b/bc832-ftdi/bc832-nrf-ftdi-fab.ko
index 86ff08bdaed7486d74c3d677c6924cd28e8e3735..8ed5651acd45a25bdaa621d0f005faef720249d6 100644
--- a/bc832-ftdi/bc832-nrf-ftdi-fab.ko
+++ b/bc832-ftdi/bc832-nrf-ftdi-fab.ko
@@ -33,6 +33,20 @@ class R_0805_small(Component):
 class Button(Component):
     ''' SW262CT-ND 
     '''
+    rect = rectangle(-.5*2.75/25.4,.5*2.75/25.4,-.5*1.4/25.4,.5*1.4/25.4)
+    pins = [
+        Pin(-3.875/25.4,2/25.4,rect),
+        Pin(3.875/25.4,2/25.4,rect),
+        Pin(-3.875/25.4,-2/25.4,rect),
+        Pin(3.875/25.4,-2/25.4,rect)
+    ]
+    prefix = 'button'
+    vias = []
+    shadow = rectangle(-.2,.2,-.11,.11)
+
+'''
+class Button(Component):
+    #SW262CT-ND 
     rect = rectangle(-.75/25.4,.75/25.4,-.5/25.4,.5/25.4)
     pins = [
         Pin(-2/25.4,.8/25.4,rect),
@@ -43,6 +57,7 @@ class Button(Component):
     prefix = 'button'
     vias = []
     shadow = rectangle(-2.1/25.4,2.1/25.4,-1.4/25.4,1.4/25.4)
+'''
 
 class TagConnectSWD(Component):
     '''
@@ -220,8 +235,8 @@ class Hole(Component):
     tap = circle(0,0,.5*1.9/25.5)
 
 
-width = .95
-height = .7
+width = 1
+height = .75
 pcb = PCB(0,0,width,height,chamfer_distance=.02)
 
 
@@ -262,31 +277,31 @@ pcb.connectH(reg['GND'],C_out[1],width=.02)
 pcb.connectH(C2[0],C_out[0],width=.02)
 
 
-mdb = BC832(ftdi.x+.57,ftdi.y+.1,-90,'Fanstel\nBC832\nNRF52')
+mdb = BC832(width-.18,ftdi.y+.1,-90,'Fanstel\nBC832\nNRF52')
 pcb += mdb
 
 
-pcb.connectD(mdb['P8'],[mdb['P8'].x-.01,mdb['P8'].y],[ftdi['TX'].x+.31,ftdi['TX'].y+.03],[ftdi['TX'].x+.03,ftdi['TX'].y-.019],ftdi['TX'],width=.014)
-pcb.connectD(mdb['P6'],[mdb['P6'].x,mdb['P6'].y+.02],[mdb['P6'].x-.07,mdb['P6'].y+.035],[ftdi['RX'].x+.28,ftdi['RX'].y-.043],[ftdi['RX'].x+.1,ftdi['RX'].y-.088],[ftdi['RX'].x+.09,ftdi['RX'].y-.03],ftdi['RX'],width=.012)
+pcb.connectD(mdb['P8'],[mdb['P8'].x-.01,mdb['P8'].y],[ftdi['TX'].x+.31,ftdi['TX'].y+.03],ftdi['TX'],width=.014)
+pcb.connectD(mdb['P6'],[mdb['P6'].x,mdb['P6'].y+.02],[mdb['P6'].x-.07,mdb['P6'].y+.035],[ftdi['RX'].x+.09,ftdi['RX'].y-.03],ftdi['RX'],width=.012)
 
 
-swd = TagConnectSWD(ftdi.x+.17,mdb.y+.1,-90,'swd')
+swd = TagConnectSWD(mdb.x-.3,mdb.y+.18,-90,'swd')
 pcb += swd
-pcb.connectD(swd['SWDCLK'],[swd['SWDCLK'].x+.02,swd['SWDCLK'].y],[mdb['SWDCLK'].x-.24,mdb['SWDCLK'].y+.01],[mdb['SWDCLK'].x-.02,mdb['SWDCLK'].y+.05],mdb['SWDCLK'],width=.012)
-pcb.connectD(swd['SWDIO'],[swd['SWDIO'].x+.02,swd['SWDIO'].y],[mdb['SWDIO'].x-.32,mdb['SWDIO'].y+.04],[mdb['SWDIO'].x-.03,mdb['SWDIO'].y+.079],mdb['SWDIO'],width=.012)
+pcb.connectD(swd['SWDCLK'],[swd['SWDCLK'].x+.02,swd['SWDCLK'].y],[mdb['SWDCLK'].x-.02,mdb['SWDCLK'].y+.05],mdb['SWDCLK'],width=.012)
+pcb.connectD(swd['SWDIO'],[swd['SWDIO'].x+.02,swd['SWDIO'].y],[mdb['SWDIO'].x-.03,mdb['SWDIO'].y+.079],mdb['SWDIO'],width=.012)
 #pcb.connectD(ftdi['RTS'],[ftdi['RTS'].x,ftdi['RTS'].y+.03],[mdb['DFU'].x-.05,mdb['DFU'].y+.12],mdb['DFU'],width=.014)
 
 
 
 
-button = Button(ftdi.x-.01,ftdi.y+.26,0)
+button = Button(ftdi.x+.05,ftdi.y+.3,0)
 pcb += button
-pcb.connectH(ftdi['GND'],[button[1].x-.07,button[1].y],button[1])
+pcb.connectH(ftdi['GND'],[button[1].x-.08,button[1].y],button[1])
 
 pcb.connectV(mdb['RESET'],[ftdi.x-.11,ftdi['TX'].y-.05],button[3],width=.014)
 pcb.connectV(button[3],button[0])
 pcb.connectV(button[1],button[2])
-pcb.connectD(mdb['GND'],[mdb['GND'].x,mdb['GND'].y+.03],[button.x+.15,mdb['GND'].y+.108],button[2],width=.012)
+pcb.connectD(mdb['GND'],[mdb['GND'].x,mdb['GND'].y+.05],[swd[4].x+.05,swd[4].y+.05],swd[4],width=.012)