Fixing some links, and order of things for images