UI refactoring work