Image display fixes