Reorganizing popovers and tooltips