Tweaks to add popover code