minor fixes
refactoring File & Image fields