Ajay/Pooja | #3199 | ui changes