Improved map and push notifications