End of Chapter 4 commits
Finish layout and routes