Refactored to use photo object. Navigation