Not only target images

Not only target images but the first two elements in the container.

The most changes are indentation, this is my first pull request didn't know it is this strict.