Additional images and some JS changeS
Fixed merge conflict in application.js