UI refactoring.