Event Handling removed, fixed button handling