New layout

Removed switch header, changed to use some Adafruit parts