Changed the email handling to sendgrid api and removed email layouts
Fixed merge?