Run UI refactoring