Re-org the nav with Jonathan's help to simplify things