Added modal and popover for text