Improved HTML output