Updated script for popover and tooltips in modal