Couple of layout corrections for chapter 7