Refactored more of the site to use the new style.