some UI refactoring