Edit and upload bug corrected