UI refactoring