Moved image.js and bugfix