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

Finished layout and routes