Final UI touch-ups