Popover tweaks (non-persistent)

@spencereldred