Review commits

Work on each page by removing my review comments and fixing as asked.
Commit a single page in each commit.