Popover changes

@kasperp