More UI refactoring.