* Update email template
* Fix minor bugs