Changes to reimplement image boxes on master branch
Tidying up after failed merge with master