Improve UI.
Some more touch ups in the UI.