Finished e-mail alerts
Moved some settings around