Some minor adjustments to the template