Popover buttons fixes