diff --git a/plugins/arcgis/service/src/ArcGISConfig.ts b/plugins/arcgis/service/src/ArcGISConfig.ts
index a0904daee..b0e19631d 100644
--- a/plugins/arcgis/service/src/ArcGISConfig.ts
+++ b/plugins/arcgis/service/src/ArcGISConfig.ts
@@ -8,10 +8,10 @@ export interface FeatureServiceConfig {
      */
     url: string
 
-		/**
-		 * Serialized ArcGISIdentityManager
-		 */
-		identityManager: string
+    /**
+     * Serialized ArcGISIdentityManager
+     */
+    identityManager: string
 
     /**
      * The feature layers.
diff --git a/plugins/arcgis/service/src/index.ts b/plugins/arcgis/service/src/index.ts
index b70e32333..948c68b54 100644
--- a/plugins/arcgis/service/src/index.ts
+++ b/plugins/arcgis/service/src/index.ts
@@ -172,7 +172,7 @@ const arcgisPluginHooks: InitPluginHook<typeof InjectedServices> = {
                 return {
                   url: updateService.url,
                   layers: updateService.layers,
-                  identityManager: existingService?.identityManager
+                  identityManager: existingService?.identityManager || ''
                 }
               })
 
diff --git a/plugins/arcgis/web-app/projects/main/src/lib/arc-admin/arc-admin.component.html b/plugins/arcgis/web-app/projects/main/src/lib/arc-admin/arc-admin.component.html
index 316095fb9..d09362254 100644
--- a/plugins/arcgis/web-app/projects/main/src/lib/arc-admin/arc-admin.component.html
+++ b/plugins/arcgis/web-app/projects/main/src/lib/arc-admin/arc-admin.component.html
@@ -3,80 +3,88 @@ <h1>ArcGIS Configuration</h1>
   <mat-card appearance="outlined">
     <mat-card-header>
       <mat-card-title>
-        Processing <button class="edit-button" mat-icon-button (click)="onEditProcessing()"><mat-icon>edit</mat-icon></button>
+        Processing
       </mat-card-title>
       <mat-card-subtitle>MAGE ArcGIS plugin processing settings.</mat-card-subtitle>
     </mat-card-header>
     <mat-card-content>
-      <div class="processing">
-        <table class="processing-table">
-          <tr>
-            <th>Enabled
-              <button class="info-button" mat-icon-button
-                (click)="showInfo('Enabled', 'Process observations and send to configured ArcGIS feature layers')">
-                <mat-icon class="info-icon" [inline]="true">info_outline</mat-icon>
-              </button>
-            </th>
-            <td>{{config.enabled}}</td>
-          </tr>
-          <tr>
-            <th>Base URL
-              <button class="info-button" mat-icon-button (click)="showInfo('Base URL', 'MAGE server base URL')">
-                <mat-icon class="info-icon" [inline]="true">info_outline</mat-icon>
-              </button>
-            </th>
-            <td>{{config.baseUrl}}</td>
-          </tr>
-          <tr>
-            <th>Interval (s)
-              <button class="info-button" mat-icon-button
-                (click)="showInfo('Interval', 'Observation query and processing frequency time interval in seconds')">
-                <mat-icon class="info-icon" [inline]="true">info_outline</mat-icon>
-              </button>
-            </th>
-            <td>{{config.intervalSeconds}}</td>
-          </tr>
-          <tr>
-            <th>Startup Interval (s)
-              <button class="info-button" mat-icon-button
-                (click)="showInfo('Startup Interval', 'Startup interval in seconds to wait for feature layer processors to be ready')">
-                <mat-icon class="info-icon" [inline]="true">info_outline</mat-icon>
-              </button>
-            </th>
-            <td>{{config.startupIntervalSeconds}}</td>
-          </tr>
-          <tr>
-            <th>Update Interval (s)
-              <button class="info-button" mat-icon-button
-                (click)="showInfo('Update Interval', 'Processing wait time interval in seconds when pending observation updates exist')">
-                <mat-icon class="info-icon" [inline]="true">info_outline</mat-icon>
-              </button>
-            </th>
-            <td>{{config.updateIntervalSeconds}}</td>
-          </tr>
-          <tr>
-            <th>Batch Size
-              <button class="info-button" mat-icon-button
-                (click)="showInfo('Batch Size', 'Maximum number of observations to process during a single time interval')">
-                <mat-icon class="info-icon" [inline]="true">info_outline</mat-icon>
-              </button>
-            </th>
-            <td>{{config.batchSize}}</td>
-          </tr>
-          <tr>
-            <th>Attachment Tolerance (ms)
-              <button class="info-button" mat-icon-button
-                (click)="showInfo('Attachment Tolerance', 'Time tolerance in milliseconds to consider an attachment as modified compared to the observation')">
-                <mat-icon class="info-icon" [inline]="true">info_outline</mat-icon>
-              </button>
-            </th>
-            <td>{{config.attachmentModifiedTolerance}}</td>
-          </tr>
-        </table>
+      <div style="width: 100%;">
+        <div class="edit-processing-form">
+          <div class="edit-enabled-field">
+            <mat-form-field appearance="fill">
+              <mat-label>Enabled</mat-label>
+              <mat-select placeholder="Enabled" [(value)]="editConfig.enabled"
+                (selectionChange)="setField('enabled', $event.value)">
+                <mat-option [value]="true">true</mat-option>
+                <mat-option [value]="false">false</mat-option>
+              </mat-select>
+              <mat-hint>Process observations and send to configured ArcGIS feature layers</mat-hint>
+            </mat-form-field>
+          </div>
+          <div class="edit-enabled-field">
+            <mat-form-field appearance="fill" floatLabel="always">
+              <mat-label>Base URL</mat-label>
+              <input type="text" matInput value="{{editConfig.baseUrl}}"
+                placeholder="https://mock.mage.com"
+                (keyup)="setField('baseUrl', baseUrlField.value)"
+                (input)="setField('baseUrl', baseUrlField.value)" #baseUrlField />
+                <mat-hint>Mage server base URL</mat-hint>
+            </mat-form-field>
+          </div>
+          <div class="edit-interval-field">
+            <mat-form-field appearance="fill">
+              <mat-label>Interval</mat-label>
+              <input type="number" min="0" matInput value="{{editConfig.intervalSeconds}}"
+                (keyup)="setNumberField('intervalSeconds', intervalSecondsField.value, 0)"
+                (input)="setNumberField('intervalSeconds', intervalSecondsField.value, 0)" #intervalSecondsField />
+                <mat-hint>Observation query and processing frequency time interval in seconds</mat-hint>
+            </mat-form-field>
+          </div>
+          <div class="edit-startup-interval-field">
+            <mat-form-field appearance="fill">
+              <mat-label>Startup Interval</mat-label>
+              <input type="number" min="0" matInput value="{{editConfig.startupIntervalSeconds}}"
+                (keyup)="setNumberField('startupIntervalSeconds', startupIntervalSecondsField.value, 0)"
+                (input)="setNumberField('startupIntervalSeconds', startupIntervalSecondsField.value, 0)"
+                #startupIntervalSecondsField />
+                <mat-hint>Startup interval in seconds to wait for feature layer processors to be ready</mat-hint>
+            </mat-form-field>
+          </div>
+          <div class="edit-update-interval-field">
+            <mat-form-field appearance="fill">
+              <mat-label>Update Interval</mat-label>
+              <input type="number" min="0" matInput value="{{editConfig.updateIntervalSeconds}}"
+                (keyup)="setNumberField('updateIntervalSeconds', updateIntervalSecondsField.value, 0)"
+                (input)="setNumberField('updateIntervalSeconds', updateIntervalSecondsField.value, 0)"
+                #updateIntervalSecondsField />
+                <mat-hint>Processing wait time interval in seconds when pending observation updates exist</mat-hint>
+            </mat-form-field>
+          </div>
+          <div class="batch-size-field">
+            <mat-form-field appearance="fill">
+              <mat-label>Batch Size</mat-label>
+              <input type="number" min="1" matInput value="{{editConfig.batchSize}}"
+                (keyup)="setNumberField('batchSize', batchSizeField.value, 1)"
+                (input)="setNumberField('batchSize', batchSizeField.value, 1)" #batchSizeField />
+                <mat-hint>Maximum number of observations to process during a single time interval</mat-hint>
+            </mat-form-field>
+          </div>
+          <div class="attachment-modified-tolerance-field">
+            <mat-form-field appearance="fill">
+              <mat-label>Attachment Tolerance</mat-label>
+              <input type="number" min="0" matInput value="{{editConfig.attachmentModifiedTolerance}}"
+                (keyup)="setNumberField('attachmentModifiedTolerance', attachmentModifiedToleranceField.value, 0)"
+                (input)="setNumberField('attachmentModifiedTolerance', attachmentModifiedToleranceField.value, 0)"
+                #attachmentModifiedToleranceField />
+                <mat-hint>Time tolerance in milliseconds to consider an attachment as modified compared to the observation</mat-hint>
+            </mat-form-field>
+          </div>
+        </div>
       </div>
     </mat-card-content>
     <mat-card-actions>
-      <button (click)="onEditProcessing()" mat-button>Edit</button>
+      <button mat-flat-button color="primary" matDialogClose (click)="saveEdit()">SAVE</button>
+      <button mat-button matDialogClose (click)="cancelEdit()">CANCEL</button>
     </mat-card-actions>
   </mat-card>
     <arc-layer [config]="config" (configChanged)="configChanged($event)"></arc-layer>
@@ -651,104 +659,6 @@ <h3 matDialogTitle>{{infoTitle}}</h3>
     </div>
   </mat-dialog-content>
 </ng-template>
-<ng-template #editProcessingDialog let-data>
-  <h2 matDialogTitle>Processing Configuration</h2>
-  <mat-dialog-content>
-    <div class="edit-processing-form">
-      <div class="edit-enabled-field">
-        <mat-form-field [style.width.%]="90">
-          <mat-select placeholder="Enabled" [(value)]="editConfig.enabled"
-            (selectionChange)="setField('enabled', $event.value)">
-            <mat-option [value]="true">true</mat-option>
-            <mat-option [value]="false">false</mat-option>
-          </mat-select>
-        </mat-form-field>
-        <button class="info-button" mat-icon-button
-          (click)="showInfo('Enabled', 'Process observations and send to configured ArcGIS feature layers')">
-          <mat-icon class="info-icon" [inline]="true">info_outline</mat-icon>
-        </button>
-      </div>
-      <div class="edit-enabled-field">
-        <mat-form-field [style.width.%]="90">
-          <input type="text" matInput value="{{editConfig.baseUrl}}"
-            (keyup)="setField('baseUrl', baseUrlField.value)"
-            (input)="setField('baseUrl', baseUrlField.value)" #baseUrlField />
-        </mat-form-field>
-        <button class="info-button" mat-icon-button
-          (click)="showInfo('Base URL', 'Mage server base URL')">
-          <mat-icon class="info-icon" [inline]="true">info_outline</mat-icon>
-        </button>
-      </div>
-      <div class="edit-interval-field">
-        <mat-form-field [style.width.%]="90">
-          <mat-label>Interval</mat-label>
-          <input type="number" min="0" matInput value="{{editConfig.intervalSeconds}}"
-            (keyup)="setNumberField('intervalSeconds', intervalSecondsField.value, 0)"
-            (input)="setNumberField('intervalSeconds', intervalSecondsField.value, 0)" #intervalSecondsField />
-        </mat-form-field>
-        <button class="info-button" mat-icon-button
-          (click)="showInfo('Interval', 'Observation query and processing frequency time interval in seconds')">
-          <mat-icon class="info-icon" [inline]="true">info_outline</mat-icon>
-        </button>
-      </div>
-      <div class="edit-startup-interval-field">
-        <mat-form-field [style.width.%]="90">
-          <mat-label>Startup Interval</mat-label>
-          <input type="number" min="0" matInput value="{{editConfig.startupIntervalSeconds}}"
-            (keyup)="setNumberField('startupIntervalSeconds', startupIntervalSecondsField.value, 0)"
-            (input)="setNumberField('startupIntervalSeconds', startupIntervalSecondsField.value, 0)"
-            #startupIntervalSecondsField />
-        </mat-form-field>
-        <button class="info-button" mat-icon-button
-          (click)="showInfo('Startup Interval', 'Startup interval in seconds to wait for feature layer processors to be ready')">
-          <mat-icon class="info-icon" [inline]="true">info_outline</mat-icon>
-        </button>
-      </div>
-      <div class="edit-update-interval-field">
-        <mat-form-field [style.width.%]="90">
-          <mat-label>Update Interval</mat-label>
-          <input type="number" min="0" matInput value="{{editConfig.updateIntervalSeconds}}"
-            (keyup)="setNumberField('updateIntervalSeconds', updateIntervalSecondsField.value, 0)"
-            (input)="setNumberField('updateIntervalSeconds', updateIntervalSecondsField.value, 0)"
-            #updateIntervalSecondsField />
-        </mat-form-field>
-        <button class="info-button" mat-icon-button
-          (click)="showInfo('Update Interval', 'Processing wait time interval in seconds when pending observation updates exist')">
-          <mat-icon class="info-icon" [inline]="true">info_outline</mat-icon>
-        </button>
-      </div>
-      <div class="batch-size-field">
-        <mat-form-field [style.width.%]="90">
-          <mat-label>Batch Size</mat-label>
-          <input type="number" min="1" matInput value="{{editConfig.batchSize}}"
-            (keyup)="setNumberField('batchSize', batchSizeField.value, 1)"
-            (input)="setNumberField('batchSize', batchSizeField.value, 1)" #batchSizeField />
-        </mat-form-field>
-        <button class="info-button" mat-icon-button
-          (click)="showInfo('Batch Size', 'Maximum number of observations to process during a single time interval')">
-          <mat-icon class="info-icon" [inline]="true">info_outline</mat-icon>
-        </button>
-      </div>
-      <div class="attachment-modified-tolerance-field">
-        <mat-form-field [style.width.%]="90">
-          <mat-label>Attachment Tolerance</mat-label>
-          <input type="number" min="0" matInput value="{{editConfig.attachmentModifiedTolerance}}"
-            (keyup)="setNumberField('attachmentModifiedTolerance', attachmentModifiedToleranceField.value, 0)"
-            (input)="setNumberField('attachmentModifiedTolerance', attachmentModifiedToleranceField.value, 0)"
-            #attachmentModifiedToleranceField />
-        </mat-form-field>
-        <button class="info-button" mat-icon-button
-          (click)="showInfo('Attachment Tolerance', 'Time tolerance in milliseconds to consider an attachment as modified compared to the observation')">
-          <mat-icon class="info-icon" [inline]="true">info_outline</mat-icon>
-        </button>
-      </div>
-    </div>
-  </mat-dialog-content>
-  <mat-dialog-actions align="end">
-    <button mat-button matDialogClose (click)="cancelEdit()">CANCEL</button>
-    <button mat-flat-button color="primary" matDialogClose (click)="saveEdit()">SAVE</button>
-  </mat-dialog-actions>
-</ng-template>
 <ng-template #editAttributesDialog let-data>
   <h2 matDialogTitle>Attributes Configuration</h2>
   <mat-dialog-content>
@@ -888,8 +798,8 @@ <h2 matDialogTitle>Attributes Configuration</h2>
     </div>
   </mat-dialog-content>
   <mat-dialog-actions align="end">
-    <button mat-button matDialogClose (click)="cancelEdit()">CANCEL</button>
     <button mat-flat-button color="primary" matDialogClose (click)="saveEdit()">SAVE</button>
+    <button mat-button matDialogClose (click)="cancelEdit()">CANCEL</button>
   </mat-dialog-actions>
 </ng-template>
 <ng-template #deleteFieldDialog let-data>
diff --git a/plugins/arcgis/web-app/projects/main/src/lib/arc-admin/arc-admin.component.scss b/plugins/arcgis/web-app/projects/main/src/lib/arc-admin/arc-admin.component.scss
index 0cd37aa01..f308245d6 100644
--- a/plugins/arcgis/web-app/projects/main/src/lib/arc-admin/arc-admin.component.scss
+++ b/plugins/arcgis/web-app/projects/main/src/lib/arc-admin/arc-admin.component.scss
@@ -7,6 +7,10 @@
   padding: 1rem;
 }
 
+.edit-processing-form .mat-form-field {
+  margin-bottom: 1.5rem !important;
+}
+
 section {
   >* {
     margin-inline-start: 0em;
diff --git a/plugins/arcgis/web-app/projects/main/src/lib/arc-admin/arc-admin.component.ts b/plugins/arcgis/web-app/projects/main/src/lib/arc-admin/arc-admin.component.ts
index 6d8ff2336..5171c4ea3 100644
--- a/plugins/arcgis/web-app/projects/main/src/lib/arc-admin/arc-admin.component.ts
+++ b/plugins/arcgis/web-app/projects/main/src/lib/arc-admin/arc-admin.component.ts
@@ -57,7 +57,7 @@ export class ArcAdminComponent implements OnInit {
 
   constructor(private arcService: ArcService, private dialog: MatDialog, private fb: FormBuilder) {
     this.config = defaultArcGISPluginConfig;
-    this.editConfig = defaultArcGISPluginConfig;
+    this.editConfig = this.copyConfig();
     this.editFieldMappings = false;
     this.attributesForm = this.fb.group({
       observationIdField: [''], 
@@ -79,6 +79,7 @@ export class ArcAdminComponent implements OnInit {
       if (!this.config.baseUrl) {
         this.config.baseUrl = window.location.origin
       }
+      this.editConfig = this.copyConfig();
       arcService.fetchPopulatedEvents().subscribe(x => this.handleEventResults(x));
     })
   }
@@ -141,7 +142,7 @@ export class ArcAdminComponent implements OnInit {
       console.log('Form Submitted:', this.editConfig);
       console.log('formValue: ', formValue);
 
-      this.editConfig = this.copyConfig();
+      this.saveEdit();
       }
       else{
         console.log('Form is invalid, please correct the errors.')
@@ -192,11 +193,6 @@ export class ArcAdminComponent implements OnInit {
     this.saveConfig();
   }
 
-  onEditProcessing() {
-    this.editConfig = this.copyConfig()
-    this.dialog.open<unknown, unknown, string>(this.editProcessingTemplate)
-  }
-
   setField(field: string, value: any) {
     if (value != undefined && value.length == 0) {
       value = undefined
@@ -303,6 +299,7 @@ export class ArcAdminComponent implements OnInit {
 
   cancelEdit() {
     console.log('Canceled configuration edit')
+    this.editConfig = this.copyConfig();
   }
 
   keys(value: any): string[] {