Minor UI improvements & refactoring