New ui code changes.