(for review -> master) Iterate each button and make sure it has the correct reference