Major layout and include changes for first chapter.