small UX changes around templates.