Use the new html markup
Clean up and fix styles for new markup