WIP: switch to use simpler popover