Chapter page cleanup

Some small changes and restructuring so the chapter page is more consistent with other content.