Improve HTML template