Remove tooltip and add popover to show original payee