Improvements to UI and codebase