Code improvements

* Move popup content out of aria-label into data attribute
* Add HTML to one of the tooltip anchors
* Add ARIA haspopup to tooltip anchors