Finish layout and routes
Merge pull request #17 from tabosque/filling-in-layout

Finish layout and routes