Fixed popover bugs, really annoying!!!!!!!!!!!