Better upload, no more image.xxx extensions