Updates for .add-on and popovers