Add click-to-close functionality and display it on screen
Remove some unused input events