PageNavigatorFactory, refactor