Some more UI refactoring