Changed ugly popover to tooltip