App: implement new leaflet based clustered map, various bug fixes