Filling in layout - changes from chapter 5

This has all the changes from chapter 5