Improved map navigation