Fix for button attr ids