add tooltips+popover upgrade