Image validation

It may have to be more thorough on the checking of file names or we
have to rename it