Slight improvements to the template