Reworked modalpop for a few fixes including the modal that never fully disappeared and the ability to have a button without a data attribute, but wrapped in a parent that can define which modal to open
Fixed merge conflict