Minor UI refactoring