fellows images and popovers
missed a commit in the css
fixing merge conflicts.