Included image uploader and bug fixing