Bug fixing for upload module and edit module

Mainly about validation