Manish Kushare

@kavinvenkatachalam , made the required UI changes, please take a look at it, whenever possible.

@kavinvenkatachalam , made the requested changes, please check it, whenever possible.

@kavinvenkatachalam , made the requested changes, please take a look at it, whenever possible

@withshubh , you can review the PR, whenever possible.

@sherfin94 , Made the suggested changes.

@kavinvenkatachalam , made the requested changes

@sherfin94 , updated the PR with requested changes. I don't have access to resolve the merge conflicts.

Closing as this issue was fixed in a hotfix