Little changes to the template