templates: a bit of layout cleanup