Bugfix/button events