modal/popover fixes