COmmiting just to pull the UI bug fixes

Signed-off-by: hariji <hariharan@freshdesk.com>
I dunno y am doing this…
SHowed a few edits after a Pull ...

Signed-off-by: hariji <hariharan@freshdesk.com>