Small changes to the template