form updates. button fixes
conflict in edit fixed