updated dev form, cleaned up Form.js further