Better containering of images