Slight UI refactoring