Fancy stuff.

UI improvements