UI layouts more robust for all but take-adv-delayed photos.
Will do that next.