navigation restructure