UI improvements.
[ci skip]