Refactor mailer layout
Update dependencies