cleanup and mailer stuff
ux tweaks and mailer
commit all for heroku bug