Refactor popup

Refactored popups to not need data attr's on trigger elements