adapted the navigation