back and edit fixed