Removed buttons and added global listeners

Removed the buttons and added giant listeners