Photo upload works locally and some more changes