repair the data and add the navigation