[PDI-12188] - Implementing changes from ux review