Improve the Navigation functionality