more navigation restructuring