Refactor URL's, settings, pages