Commit before chapter 5
Finish layout and routes