Improved navigator functionality.