Updated template to fix spaces