New emailing template and UX update