UI improvements.

UI improvements.