More image layout tweaks