UI refactoring done