Template trimmed

Template trimmed, so we don't get errors cause empty spaces in the templates.