Bring templates closer in line with presenter's expectations