UI tweaking.

Improved icons and messaging.