Basic UI refactoring