Refactor de la navigation