Improve HTML structure