Fixed the issue related to the navigation