diff --git a/package.json b/package.json
index ed56ee081e..e974dd9e32 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
       "git add"
     ]
   },
-  "main": "lib/index.js",
+  "main": "src/index.js",
   "files": [
     "dist",
     "lib"
diff --git a/src/components/Form.js b/src/components/Form.js
index e32a7b239c..5d02a06012 100644
--- a/src/components/Form.js
+++ b/src/components/Form.js
@@ -189,7 +189,7 @@ export default class Form extends Component {
     const _SchemaField = registry.fields.SchemaField;
 
     return (
-      <form
+      <div
         className={className ? className : "rjsf"}
         id={id}
         name={name}
@@ -200,7 +200,7 @@ export default class Form extends Component {
         encType={enctype}
         acceptCharset={acceptcharset}
         noValidate={noHtml5Validate}
-        onSubmit={this.onSubmit}>
+        >
         {this.renderErrors()}
         <_SchemaField
           schema={schema}
@@ -218,12 +218,12 @@ export default class Form extends Component {
           children
         ) : (
           <p>
-            <button type="submit" className="btn btn-info">
+            <button type="submit" className="btn btn-info" onClick={this.onSubmit} >
               Submit
             </button>
           </p>
         )}
-      </form>
+      </div>
     );
   }
 }