Added NewWolrd screen, refactoring