Improve handle clicking and mouse click handling.