Final edit for popover