More image ordering tweaks