Finish chapter 5 layout and routes