WIP- Second layout design

WIP - Trying to figure out a better solution. Schematic error solved