Added no image choice, plus jshint fixes