minor UI refactoring