Finish chapter 5 exercises
Merge branch 'filling-in-layout'