PLA-833 ui changes