Final changes for the photo album scenario.