Re-worked the html into sections.