Finish layout and routes (chapter 5)