Fixed click handler. Improved closing.