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

This reverts commit 0531425c4dd46ad48c823d98b62fafddcfd79a1d.