Complete mailer, adjust UI