Refactor of navlists