Ron, I used to have the same issues as you re the alignment of photos. I use my computer only to upload photos. The way I used to deal with it was to make sure I took the photos with the phone in the same orientation each time, eg button bottom or right side each time then when I had the photos on the computer I noted which ones changed orientation. Once I knew what would happen, I used to rotate individual photos on the computer prior to uploading. Pain, but that was my work around. I do not seem to have the issues now with my S7.