cleanup and mailer stuff
ux tweaks and mailer