Fixing breaking changes from new version of ui

Fixing breaking changes from new version of ui