Updated PopoverController.