Re-did photo functionality for Samsung support

Re-did photo functionality for Samsung support