Added buttonHandler