Minor style fixes in the templates