Tweaked UI and tests.