Fixed the navigation