Updated some more hardcoded pictures, recompute location for those who overlap.