Update to nav-list pattern