improve popovers + refacto text formating