[OE-2714] updated the buttons to use the new handleButton() method