Improve zoom in mapping