Use video field and image field seperately.
Some small fixes.