Changed tooltip to popover, fixed sorting issues