Run ui refactoring