Changed xpath

They changed the setup of the website slightly so I was not able to pick
up a couple images using my existing xpath. Made the xpath more flexible
where possible so hopefully I will avoid this problem in the future