fixed problems with edit screen and save function