Cleaned up navigation on map