Changes from chapter 4
Finish layout and routes