HTML markup, error reporting and styling enhancements