Changed a lot of the Layout HTML to be more consistent, and better overall.