Tooltip/Popover refactor