Refactored the HTML to support the new CSS.