Completed chapter 5.3, ready for 5.4
Finish layout and routes