Fixed whitespace in templates