Adding better photo selection and retrieval