Adjustments on template