Finish layout and routes (end of Ch 05)