UI refactoring pass two complete