Finished chapter 5.2
Finish layout and routes