Add a close button

pull request
No need to commit commented logic