Improve event handling
Improve overlay