Template changes to control formatting