Fixed the navigation issue