Fixed the navigation once again