move tooltip before popover + cleanup