Refactoring planche navigation