Updated before deployment 9/5

Does not included update webmap or print function