Sprint6 design update

Pull request to merge sprint6 design updates into sprint6.

NOTE: Sprint6 has been merged into sprint6_design-update so this should be a very easy request in.  Nothing has changed as far as content or functionality except for comments in the DOM and the structure and style of the pages.