popover improvements: single mode