Added more buttons and handlers.