Revert "Revert "form edits, and dropdowns and remove FID field""

This reverts commit d742cf57c544cf9907462360e5e09039acaf2df0.