Add some features to modals
Fix typo bug and some cleanup
More clean mailer config