Use new image layout