Refactor. Check menu area for mouse events
Add and extend events