Add photo upload and thumbnail
Merge