Finish layout and routes - end of Chapter 5