Fixed ID selectors used for buttons and data attributes

Thanks go out to attendee who let me know about this - I forgot to push
the original commit that addressed this! :)