homepage pictureand modal form
merge conflicts