Updated popover behaviour some more.