Changed ButtonEventHandler to EventHandler