More UI touch-ups