Creating a new view for managing photos
Resolved merge conflicts