Polish nav-list cc @oliger