More super minor UI changes and refactoring