Add globe icon, change waypoint function