Various minor improvements to UI