Finish up PhotoViewer