Modal close refactor

[chawes13]

Resolves #517

Author Checklist

• [X] Add unit test(s)
• [X] Update version in package.json (see the versioning guidelines)
• [x] Update documentation (if necessary)
• [X] Add story to storybook (if necessary)
• [x] Assign dev reviewer