Added mailer to send email
More fixes to email