adjust popover show and remove to be a little easier