UX changes to mail template