Several alert-buttons did not close properly

* Fixes #152