Fix up sending of button presses
Change over to use the button library