slight UI refactoring