CLC-1110 - Implement the image placement
https://jira.media.berkeley.edu/jira/browse/CLC-1110
Merge pull request #556 from christianv/CLC-1110

CLC-1110 - Implement the image placement