Refactored AMPopover