Re: RFC: Navigation restructuring