adding data-attributes and removing target=_blank where it was not needed, added active class