Finished layout and routes
Merge pull request #2 from andystructible/filling-in-layout

Finished layout and routes