Add toolbox, and popovers