Rework the picture download behavior

Should fix #412
Corrected spacing
Merge pull request #415 from ctrlaltca/no_pictures_yet

Rework the picture download behavior