UI refactoring; minor UI fixes