Melanie/Pooja | #3279 | fixing ui defects