Improvements in button events dispatching