Improve the html