Minor layout fix to templates