#89 #97 User experience updates

[Satendra-SR]

#89 #97

Please complete the following steps and check these boxes before filing your PR:

Types of changes

• Bug fix (a change which fixes an issue)
• New feature (a change which adds functionality)

Short description of what this resolves:

Checklist:

• I have performed a self-review of my own code.
• The code follows the style guidelines of this project.
• The code changes are passing the CI checks
• I have documented my code wherever required.
• The changes require a change to the documentation.
• I have updated the documentation based on the my changes.

[rudresh]

One minor suggestion and then you can merge it.