fixed edit and back