Rework the navigation with checklist