Improved HTML markup