Went on fixing image issues