improving etc diagram by grouping and better popovers
bug fix for use of images