Add ability to edit navigation order/grouping in one screen