Pooja/Melanie |#3276 | UI defects fixes