Updated UI.
Updated UI and tests.