Finally fixed the popover