Clean up board layout
Merge pull request #25 from PapaMarky/clean-up

Clean up board layout