added fix to image issues and fix content