Various minor UI polishings