Finish the job from 2ed5e72
Fix button id name clash