Fix forms using popover