Use correct button/data references