Fix item button delegate bugs