restructure navigation