Added popover button flag & handlers