mailer changes and welcome modal update