Chapter 2 changes and layout changes

Chapter 2 changes: continued
layout changes: default layout changes