Added map update forms and marker clustering