Improved the HTML