[11] UI refactoring