Want to change this to "Add Photo" and fix #571?