Changes to generated HTML to allow proper validation