Added Js to allow user to select from default images
Fixed conflicts