update some feature

everything is working fine. Discuss with regarding the usability of map and email
Thanks