Callback function for clicking buttons now also returns the associated unitID for the button