[OE-2714] fixed buttons and updated to use the new handleButton method.