Better data provisioning with bigger dictionaries. UI cleanup.