Fixed layout.
Show the filename for photo.
Removed unused code.