Applied fixes to meet VIP platform standards. Also added close to the shortcode popover