Fixes in Emails
Enhanced email template