Improve HTML templates