Updated popup images and css to match
Merge branch 'master' into gh-pages