Yet another UI change.

These should have been in a single commit ;_;