Various minor UI updates