Describe your changes

Issue ticket numbers: [#648, #647]

Links: [Link1, Link2]

Close: #647

Close: #648

Evidence:

https://www.loom.com/share/7f44a9091dbb49e4908c7fafca4c19b2?sid=f7871348-a8cf-4a2e-a96c-a7efd76f006a

Type of change

Please delete options that are not relevant.

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to not work as expected)
• This change requires a documentation update

Checklist before requesting a review

• I have performed a self-review of my code
• I have tested on Chrome and Firefox
• I have tested on a mobile device
• I have provided a screenshot or recording of changes in my PR if there were updates to the frontend