UI touch-ups