Lots of little UI refactorings.