Finish layout and routes (end of Ch 05)
Merge branch 'filling-in-layout'