Finish layout and routes
Merge pull request #1 from ackley5/filling-in-layout

Finish layout and routes