Fix overlay to work better with new template.