Add back tooltip and popover capabilities