Updated HTML output to be more compliant.