Editable Grid more code
conflict resolved