Another fixes...
A lot of images improvements