Chapter 5 - Filling in the layout related changes