tweaks to templates after feedback by @leggetter on #933