Changed photo options popup, added description to photo preview
fixed merge conflicts
merging