Changed mailer messages, slight UI tweaks