Fix text changes and add popover