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

Finish layout and routes