Fixed bugs and started work on e-mail notifications
Rearranging