Finish layout and routes for Chapter 5