add photo moved to within form
modal frames
fix merge conflict
MERGE