Few more fixes to email template