update layout per Ch5.2
this is my commit test
Merge branch 'filling-in-layout-c5'