Improve VenueMapVC