Integrating UI refactoring