Fixed the navigation issues