Properly close modal
Merge pull request #1161 from onepercentclub/feature/more-functional-test-features

Properly close modal