Fixed Routing Issue and updated mailer