more adjustments to the template