Finish layout and routes
Merge pull request #2 from alvaroemmanuel/filling-in-layout

Finish layout and routes