Improve HTML of templates according to Adam