Move popover to directive