popover improvements