Improved HTML template