Work on the navigation structure