Progress with refactoring reactive navigators