Finish layout and routes
Merge branch 'master' of https://github.com/rezerbit/sample_app