Pooja/Melanie | #3245 | Fixing UI defects