Rework the picture download behavior

Should fix #412
Can you clean up the spacing here?