fixed edit-bug and table-shift