Fixing UI Specs

Related Work Items: #17349