Image improvements
Image improvements