images adapter improvements