1. fix Switching on the map
2. change app name and app icon