updated with the layout changes and new form.js flattened out