Hooked up photo view
merging upstream