Remove images.js; address a case with no images; formmating