Upload files
Resolve modal bug
Refactoring code