Added images. Refactored file upload.