Refactored navigators definition and creation.