Updated the navigation class