Various minor UI improvements