Altered code for new photo naming scheme, minor layout change.