diff --git a/components/src/components/Map/Component.ts b/components/src/components/Map/Component.ts
index bc92c7f8f..e49266f78 100644
--- a/components/src/components/Map/Component.ts
+++ b/components/src/components/Map/Component.ts
@@ -75,7 +75,7 @@ export default class Component extends (FieldComponent as any) {
     const {
       numPoints,
       defaultZoom,
-      readOnlyMap,
+      allowSubmissions,
       center,
       defaultValue,
       myLocation,
@@ -97,7 +97,7 @@ export default class Component extends (FieldComponent as any) {
       form,
       numPoints,
       defaultZoom,
-      readOnlyMap,
+      readOnlyMap: !allowSubmissions, // if allow submissions, read only is false
       defaultValue,
       onDrawnItemsChange: this.saveDrawnItems.bind(this),
       viewMode,
diff --git a/components/src/components/Map/editForm/Component.edit.data.ts b/components/src/components/Map/editForm/Component.edit.data.ts
index 29d343100..e72e1f1e5 100644
--- a/components/src/components/Map/editForm/Component.edit.data.ts
+++ b/components/src/components/Map/editForm/Component.edit.data.ts
@@ -3,6 +3,14 @@ export default {
   label: 'Data',
   weight: 20,
   components: [
+    {
+      html: '<h2>Default Values</h2>',
+      key: 'simplecontent1',
+      type: 'simplecontent',
+      input: false,
+      tableView: false,
+      label: 'Text/Images',
+    },
     {
       type: 'map',
       label: 'Default Value',
@@ -13,32 +21,6 @@ export default {
         'This will be the value for this field, before user interaction.',
       input: true,
     },
-    {
-      label: 'Marker Type ',
-      values: [
-        {
-          label: 'Add a point marker (drop a pin)',
-          value: 'marker',
-        },
-        {
-          label:
-            'Add circular area of interest through a point and custom radius',
-          value: 'circle',
-        },
-      ],
-      defaultValue: 'marker',
-      key: 'markerType',
-      type: 'simpleradios',
-      input: true,
-    },
-    {
-      label: 'How many Markers per Submission?',
-      key: 'numPoints',
-      type: 'simplenumber',
-      defaultValue: 1,
-      input: true,
-    },
-
     {
       label: 'Default Zoom Level',
       description:
@@ -64,18 +46,51 @@ export default {
       tableView: false,
       markerType: 'marker',
       defaultZoom: 5,
-      readOnlyMap: false,
+      allowSubmissions: true,
       description:
         'Please select the desired default center using a single marker',
     },
     {
-      label: 'Read Only Map',
+      html: '<h2>Submitter Options</h2>',
+      key: 'simplecontent1',
+      type: 'simplecontent',
+      input: false,
+      tableView: false,
+      label: 'Text/Images',
+    },
+    {
+      label: 'Allow submitters to add input on the map',
       description:
         'This allows for the user to view and scroll the map, but not add any input',
-      key: 'readOnlyMap',
+      key: 'allowSubmissions',
       type: 'simplecheckbox',
       input: true,
     },
+    {
+      label: 'Marker Type ',
+      values: [
+        {
+          label: 'Add a point marker (drop a pin)',
+          value: 'marker',
+        },
+        {
+          label:
+            'Add circular area of interest through a point and custom radius',
+          value: 'circle',
+        },
+      ],
+      defaultValue: 'marker',
+      key: 'markerType',
+      type: 'simpleradios',
+      input: true,
+    },
+    {
+      label: 'How many Markers per Submission?',
+      key: 'numPoints',
+      type: 'simplenumber',
+      defaultValue: 1,
+      input: true,
+    },
     {
       label: 'Submitter "My Location" button',
       description: