diff --git a/app/plugins/CoreEnroller/src/View/Cell/AttributeCollectorsCell.php b/app/plugins/CoreEnroller/src/View/Cell/AttributeCollectorsCell.php
new file mode 100644
index 000000000..bef6e3072
--- /dev/null
+++ b/app/plugins/CoreEnroller/src/View/Cell/AttributeCollectorsCell.php
@@ -0,0 +1,89 @@
+<?php
+/*
+ * COmanage Registry Attribute Collectors Cell
+ *
+ * Portions licensed to the University Corporation for Advanced Internet
+ * Development, Inc. ("UCAID") under one or more contributor license agreements.
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @link          https://www.internet2.edu/comanage COmanage Project
+ * @package       registry
+ * @since         COmanage Registry v5.1.0
+ * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+ *
+ * This generic modal dialog stub is used for confirmations, e.g. when deleting a record.
+ * The text of the box is overridden with JavaScript, and the confirm button is intended to
+ * click a CakePHP postLink or postButton in the DOM. Use jsConfirmGeneric() to call it.
+ */
+
+declare(strict_types=1);
+
+namespace CoreEnroller\View\Cell;
+
+use Cake\View\Cell;
+use Cake\Database\Expression\QueryExpression;
+use Cake\ORM\Query;
+use Cake\Utility\Hash;
+
+/**
+ * AttributeCollectors cell
+ */
+class AttributeCollectorsCell extends Cell
+{
+  /**
+   * List of valid options that can be passed into this
+   * cell's constructor.
+   *
+   * @var array<string, mixed>
+   */
+  protected $_validCellOptions = [
+    'vv_obj',
+    'vv_step',
+    'viewVars',
+  ];
+
+  /**
+   * Initialization logic run at the end of object construction.
+   *
+   * @return void
+   */
+  public function initialize(): void
+  {
+  }
+
+  /**
+   * Default display method.
+   *
+   * @param int $petitionId
+   * @return void
+   * @since  COmanage Registry v5.1.0
+   */
+  public function display(int $petitionId): void
+  {
+    $vv_enrollment_atttributes_ids = Hash::extract($this->vv_obj->petition_attributes, '{n}.enrollment_attribute_id');
+    $vv_enrollment_atttributes_ids = array_unique($vv_enrollment_atttributes_ids);
+
+    $vv_enrollment_attributes = $this->fetchTable('EnrollmentAttributes')
+      ->find()
+      ->where(fn(QueryExpression $exp, Query $q) => $exp->in('id', $vv_enrollment_atttributes_ids))
+      ->order(['ordr' => 'ASC'])
+      ->toArray();
+
+    $this->set('vv_enrollment_attributes', $vv_enrollment_attributes);
+    $this->set('vv_step', $this->vv_step);
+    $this->set('vv_obj', $this->vv_obj);
+  }
+}
diff --git a/app/plugins/CoreEnroller/src/View/Cell/BasicAttributeCollectorsCell.php b/app/plugins/CoreEnroller/src/View/Cell/BasicAttributeCollectorsCell.php
new file mode 100644
index 000000000..16e12361b
--- /dev/null
+++ b/app/plugins/CoreEnroller/src/View/Cell/BasicAttributeCollectorsCell.php
@@ -0,0 +1,81 @@
+<?php
+/*
+ * COmanage Registry Basic Attribute Collectors Cell
+ *
+ * Portions licensed to the University Corporation for Advanced Internet
+ * Development, Inc. ("UCAID") under one or more contributor license agreements.
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @link          https://www.internet2.edu/comanage COmanage Project
+ * @package       registry
+ * @since         COmanage Registry v5.1.0
+ * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+ *
+ * This generic modal dialog stub is used for confirmations, e.g. when deleting a record.
+ * The text of the box is overridden with JavaScript, and the confirm button is intended to
+ * click a CakePHP postLink or postButton in the DOM. Use jsConfirmGeneric() to call it.
+ */
+
+declare(strict_types=1);
+
+namespace CoreEnroller\View\Cell;
+
+use Cake\View\Cell;
+
+/**
+ * BasicAttributeCollectors cell
+ */
+class BasicAttributeCollectorsCell extends Cell
+{
+    /**
+     * List of valid options that can be passed into this
+     * cell's constructor.
+     *
+     * @var array<string, mixed>
+     */
+  protected $_validCellOptions = [
+    'vv_obj',
+    'vv_step',
+    'viewVars',
+  ];
+
+    /**
+     * Initialization logic run at the end of object construction.
+     *
+     * @return void
+     */
+    public function initialize(): void
+    {
+    }
+
+  /**
+   * Default display method.
+   *
+   * @param int $petitionId
+   * @return string
+   * @since  COmanage Registry v5.1.0
+   */
+    public function display(int $petitionId): void
+    {
+      $vv_petition_basic_attribute_set = $this->fetchTable('PetitionBasicAttributeSets')
+        ->find()
+        ->where(['PetitionBasicAttributeSets.petition_id' => $this->vv_obj->id])
+        ->firstOrFail();
+      
+      $this->set('vv_petition_basic_attribute_set', $vv_petition_basic_attribute_set);
+      $this->set('vv_obj', $this->vv_obj);
+    }
+}
diff --git a/app/plugins/CoreEnroller/src/View/Cell/EmailVerifiersCell.php b/app/plugins/CoreEnroller/src/View/Cell/EmailVerifiersCell.php
new file mode 100644
index 000000000..e855b6e2a
--- /dev/null
+++ b/app/plugins/CoreEnroller/src/View/Cell/EmailVerifiersCell.php
@@ -0,0 +1,85 @@
+<?php
+/*
+ * COmanage Registry Email Verifiers Cell
+ *
+ * Portions licensed to the University Corporation for Advanced Internet
+ * Development, Inc. ("UCAID") under one or more contributor license agreements.
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @link          https://www.internet2.edu/comanage COmanage Project
+ * @package       registry
+ * @since         COmanage Registry v5.1.0
+ * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+ *
+ * This generic modal dialog stub is used for confirmations, e.g. when deleting a record.
+ * The text of the box is overridden with JavaScript, and the confirm button is intended to
+ * click a CakePHP postLink or postButton in the DOM. Use jsConfirmGeneric() to call it.
+ */
+
+declare(strict_types=1);
+
+namespace CoreEnroller\View\Cell;
+
+use Cake\View\Cell;
+
+/**
+ * EmailVerifiers cell
+ */
+class EmailVerifiersCell extends Cell
+{
+  /**
+   * List of valid options that can be passed into this
+   * cell's constructor.
+   *
+   * @var array<string, mixed>
+   */
+  protected $_validCellOptions = [
+    'vv_obj',
+    'vv_step',
+    'viewVars',
+  ];
+
+  /**
+   * Initialization logic run at the end of object construction.
+   *
+   * @return void
+   */
+  public function initialize(): void
+  {
+  }
+
+  /**
+   * Default display method.
+   *
+   * @param int $petitionId
+   * @return void
+   * @since  COmanage Registry v5.1.0
+   */
+  public function display(int $petitionId): void
+  {
+    // Because Petition Verifications are not tracked on a per-step basis, we just pull all
+    // associated with the Petition
+
+    $vv_pv =  $this->fetchTable('CoreEnroller.PetitionVerifications')
+      ->find()
+      ->where(['PetitionVerifications.petition_id' => $this->vv_obj->id])
+      ->contain(['Verifications'])
+      ->all();
+    
+    $this->set('vv_pv', $vv_pv);
+    $this->set('viewVars', $this->viewVars);
+  }
+}
diff --git a/app/plugins/CoreEnroller/src/View/Cell/IdentifierCollectorsCell.php b/app/plugins/CoreEnroller/src/View/Cell/IdentifierCollectorsCell.php
new file mode 100644
index 000000000..af18eb85b
--- /dev/null
+++ b/app/plugins/CoreEnroller/src/View/Cell/IdentifierCollectorsCell.php
@@ -0,0 +1,80 @@
+<?php
+/*
+ * COmanage Registry Identifiers Collectors Cell
+ *
+ * Portions licensed to the University Corporation for Advanced Internet
+ * Development, Inc. ("UCAID") under one or more contributor license agreements.
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @link          https://www.internet2.edu/comanage COmanage Project
+ * @package       registry
+ * @since         COmanage Registry v5.1.0
+ * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+ *
+ * This generic modal dialog stub is used for confirmations, e.g. when deleting a record.
+ * The text of the box is overridden with JavaScript, and the confirm button is intended to
+ * click a CakePHP postLink or postButton in the DOM. Use jsConfirmGeneric() to call it.
+ */
+
+declare(strict_types=1);
+
+namespace CoreEnroller\View\Cell;
+
+use Cake\View\Cell;
+
+/**
+ * IdentifierCollectors cell
+ */
+class IdentifierCollectorsCell extends Cell
+{
+  /**
+   * List of valid options that can be passed into this
+   * cell's constructor.
+   *
+   * @var array<string, mixed>
+   */
+  protected $_validCellOptions = [
+    'vv_obj',
+    'vv_step',
+    'viewVars',
+  ];
+
+  /**
+   * Initialization logic run at the end of object construction.
+   *
+   * @return void
+   */
+  public function initialize(): void
+  {
+  }
+
+  /**
+   * Default display method.
+   *
+   * @param int $petitionId
+   * @return void
+   * @since  COmanage Registry v5.1.0
+   */
+  public function display(int $petitionId): void
+  {
+    $vv_pi = $this->fetchTable('CoreEnroller.PetitionIdentifiers')
+      ->find()
+      ->where(['petition_id' => $this->vv_obj->id])
+      ->first();
+
+    $this->set('vv_pi', $vv_pi);
+  }
+}
diff --git a/app/plugins/CoreEnroller/src/View/Cell/InvitationAcceptersCell.php b/app/plugins/CoreEnroller/src/View/Cell/InvitationAcceptersCell.php
new file mode 100644
index 000000000..320b8dc87
--- /dev/null
+++ b/app/plugins/CoreEnroller/src/View/Cell/InvitationAcceptersCell.php
@@ -0,0 +1,80 @@
+<?php
+/*
+ * COmanage Registry Invitation Accepters Cell
+ *
+ * Portions licensed to the University Corporation for Advanced Internet
+ * Development, Inc. ("UCAID") under one or more contributor license agreements.
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @link          https://www.internet2.edu/comanage COmanage Project
+ * @package       registry
+ * @since         COmanage Registry v5.1.0
+ * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+ *
+ * This generic modal dialog stub is used for confirmations, e.g. when deleting a record.
+ * The text of the box is overridden with JavaScript, and the confirm button is intended to
+ * click a CakePHP postLink or postButton in the DOM. Use jsConfirmGeneric() to call it.
+ */
+
+declare(strict_types=1);
+
+namespace CoreEnroller\View\Cell;
+
+use Cake\View\Cell;
+
+/**
+ * InvitationAccepters cell
+ */
+class InvitationAcceptersCell extends Cell
+{
+  /**
+   * List of valid options that can be passed into this
+   * cell's constructor.
+   *
+   * @var array<string, mixed>
+   */
+  protected $_validCellOptions = [
+    'vv_obj',
+    'vv_step',
+    'viewVars',
+  ];
+
+  /**
+   * Initialization logic run at the end of object construction.
+   *
+   * @return void
+   */
+  public function initialize(): void
+  {
+  }
+
+  /**
+   * Default display method.
+   *
+   * @param int $petitionId
+   * @return void
+   * @since  COmanage Registry v5.1.0
+   */
+  public function display(int $petitionId): void
+  {
+    $vv_pa = $this->fetchTable('CoreEnroller.PetitionAcceptances')
+      ->find()
+      ->where(['petition_id' => $this->vv_obj->id])
+      ->first();
+    
+    $this->set('vv_pa', $vv_pa);
+  }
+}
diff --git a/app/plugins/CoreEnroller/templates/element/petition/attributeCollectorsStep.php b/app/plugins/CoreEnroller/templates/cell/AttributeCollectors/display.php
similarity index 85%
rename from app/plugins/CoreEnroller/templates/element/petition/attributeCollectorsStep.php
rename to app/plugins/CoreEnroller/templates/cell/AttributeCollectors/display.php
index 0293a519f..e2d44c602 100644
--- a/app/plugins/CoreEnroller/templates/element/petition/attributeCollectorsStep.php
+++ b/app/plugins/CoreEnroller/templates/cell/AttributeCollectors/display.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * COmanage Registry Attibutte Collectors Step
+ * COmanage Registry Attribute Collectors display
  *
  * Portions licensed to the University Corporation for Advanced Internet
  * Development, Inc. ("UCAID") under one or more contributor license agreements.
@@ -31,20 +31,6 @@
 
 declare(strict_types = 1);
 
-use Cake\Database\Expression\QueryExpression;
-use Cake\ORM\Query;
-use Cake\Utility\Hash;
-
-// Extract unique enrollment attribute IDs
-$vv_enrollment_atttributes_ids = Hash::extract($vv_obj->petition_attributes, '{n}.enrollment_attribute_id');
-$vv_enrollment_atttributes_ids = array_unique($vv_enrollment_atttributes_ids);
-
-$enrollmentAttributesTable = $this->Petition->getTable('EnrollmentAttributes');
-$vv_enrollment_attributes = $enrollmentAttributesTable->find()
-  ->where(fn(QueryExpression $exp, Query $q) => $exp->in('id', $vv_enrollment_atttributes_ids))
-  ->order(['ordr' => 'ASC'])
-  ->toArray();
-
 ?>
 
 <ul>
diff --git a/app/plugins/CoreEnroller/templates/element/petition/basicAttributeCollectorsStep.php b/app/plugins/CoreEnroller/templates/cell/BasicAttributeCollectors/display.php
similarity index 86%
rename from app/plugins/CoreEnroller/templates/element/petition/basicAttributeCollectorsStep.php
rename to app/plugins/CoreEnroller/templates/cell/BasicAttributeCollectors/display.php
index e56d9dfd0..88b9562f0 100644
--- a/app/plugins/CoreEnroller/templates/element/petition/basicAttributeCollectorsStep.php
+++ b/app/plugins/CoreEnroller/templates/cell/BasicAttributeCollectors/display.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * COmanage Registry Basic Attribute Collector Set
+ * COmanage Registry Basic Attribute Collectors Cell Display
  *
  * Portions licensed to the University Corporation for Advanced Internet
  * Development, Inc. ("UCAID") under one or more contributor license agreements.
@@ -25,16 +25,12 @@
  * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
  */
 
-  declare(strict_types = 1);
+declare(strict_types = 1);
 
-  if($vv_obj->id === null) {
-    return __d('error', 'notfound', 'Petition Attributes');
-  }
+if($vv_obj->id === null) {
+  return __d('error', 'notfound', 'Petition Attributes');
+}
 
-  $tableObj = $this->Petition->getTable('PetitionBasicAttributeSets');
-  $vv_petition_basic_attribute_set = $tableObj->find()
-    ->where(['PetitionBasicAttributeSets.petition_id' => $vv_obj->id])
-    ->firstOrFail();
 ?>
 <ul>
   <li class="petition-attr-name">
diff --git a/app/plugins/CoreEnroller/templates/cell/EmailVerifiers/display.php b/app/plugins/CoreEnroller/templates/cell/EmailVerifiers/display.php
new file mode 100644
index 000000000..a3bf4d13b
--- /dev/null
+++ b/app/plugins/CoreEnroller/templates/cell/EmailVerifiers/display.php
@@ -0,0 +1,53 @@
+<?php
+/*
+ * COmanage Registry Email Verifiers Cell Display
+ *
+ * Portions licensed to the University Corporation for Advanced Internet
+ * Development, Inc. ("UCAID") under one or more contributor license agreements.
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @link          https://www.internet2.edu/comanage COmanage Project
+ * @package       registry
+ * @since         COmanage Registry v5.1.0
+ * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+ *
+ * This generic modal dialog stub is used for confirmations, e.g. when deleting a record.
+ * The text of the box is overridden with JavaScript, and the confirm button is intended to
+ * click a CakePHP postLink or postButton in the DOM. Use jsConfirmGeneric() to call it.
+ */
+
+declare(strict_types=1);
+
+use App\Lib\Enum\VerificationMethodEnum;
+
+?>
+
+<?php if(!empty($vv_pv)): ?>
+  <ul>
+    <?php foreach($vv_pv as $pv): ?>
+      <li><?= $pv->mail ?>:
+        <?php if(!empty($pv->verification) && $pv->verification->isVerified()): ?>
+          <?= __d('result', 'Verifications.status', [
+            VerificationMethodEnum::getLocalization($pv->verification->method),
+            $this->Time->nice($pv->verification->verification_time, $viewVars["vv_tz"])
+          ]) ?>
+        <?php else: ?>
+          <span class="mr-1 badge bg-warning unverified"><?= __d('field','unverified') ?></span>
+        <?php endif; ?>
+      </li>
+    <?php endforeach; ?>
+  </ul>
+<?php endif; ?>
\ No newline at end of file
diff --git a/app/plugins/CoreEnroller/templates/cell/IdentifierCollectors/display.php b/app/plugins/CoreEnroller/templates/cell/IdentifierCollectors/display.php
new file mode 100644
index 000000000..a5c6bae8a
--- /dev/null
+++ b/app/plugins/CoreEnroller/templates/cell/IdentifierCollectors/display.php
@@ -0,0 +1,39 @@
+<?php
+/*
+ * COmanage Registry Identifiers Collectors Cell
+ *
+ * Portions licensed to the University Corporation for Advanced Internet
+ * Development, Inc. ("UCAID") under one or more contributor license agreements.
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @link          https://www.internet2.edu/comanage COmanage Project
+ * @package       registry
+ * @since         COmanage Registry v5.1.0
+ * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+ *
+ * This generic modal dialog stub is used for confirmations, e.g. when deleting a record.
+ * The text of the box is overridden with JavaScript, and the confirm button is intended to
+ * click a CakePHP postLink or postButton in the DOM. Use jsConfirmGeneric() to call it.
+ */
+
+?>
+<?php if(!empty($vv_pi->identifier)): ?>
+  <ul>
+    <li>
+      <?= __d('core_enroller', 'result.IdentifierCollector.collected', [$vv_pi->identifier]) ?>
+    </li>
+  </ul>
+<?php endif; ?>
\ No newline at end of file
diff --git a/app/plugins/CoreEnroller/templates/cell/InvitationAccepters/display.php b/app/plugins/CoreEnroller/templates/cell/InvitationAccepters/display.php
new file mode 100644
index 000000000..23b20b300
--- /dev/null
+++ b/app/plugins/CoreEnroller/templates/cell/InvitationAccepters/display.php
@@ -0,0 +1,50 @@
+<?php
+/*
+ * COmanage Registry Invitation Accepters Cell Display
+ *
+ * Portions licensed to the University Corporation for Advanced Internet
+ * Development, Inc. ("UCAID") under one or more contributor license agreements.
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @link          https://www.internet2.edu/comanage COmanage Project
+ * @package       registry
+ * @since         COmanage Registry v5.1.0
+ * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+ *
+ * This generic modal dialog stub is used for confirmations, e.g. when deleting a record.
+ * The text of the box is overridden with JavaScript, and the confirm button is intended to
+ * click a CakePHP postLink or postButton in the DOM. Use jsConfirmGeneric() to call it.
+ */
+
+declare(strict_types=1);
+
+?>
+
+<ul>
+  <li>
+    <?php
+    if(!empty($vv_pa)) {
+      if($vv_pa['accepted']) {
+        print __d('core_enroller', 'result.InvitationAccepters.accepted', [$vv_pa['modified']]);
+      } else {
+        print __d('core_enroller', 'result.InvitationAccepters.declined', [$vv_pa['modified']]);
+      }
+    } else {
+      print __d('core_enroller', 'result.InvitationAccepters.none');
+    }
+    ?>
+  </li>
+</ul>
\ No newline at end of file
diff --git a/app/plugins/CoreEnroller/templates/element/petition/emailVerifiersStep.php b/app/plugins/CoreEnroller/templates/element/petition/emailVerifiersStep.php
deleted file mode 100644
index 33b48278b..000000000
--- a/app/plugins/CoreEnroller/templates/element/petition/emailVerifiersStep.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-use App\Lib\Enum\VerificationMethodEnum;
-
-$PetitionVerifications = $this->Petition->getTable('CoreEnroller.PetitionVerifications');
-
-// Because Petition Verifications are not tracked on a per-step basis, we just pull all
-// associated with the Petition
-
-$vv_pv =  $PetitionVerifications->find()
-  ->where(['PetitionVerifications.petition_id' => $vv_obj->id])
-  ->contain(['Verifications'])
-  ->all();
-
-?>
-
-<?php if(!empty($vv_pv)): ?>
-  <ul>
-    <?php foreach($vv_pv as $pv): ?>
-    <li><?= $pv->mail ?>:
-    <?php if(!empty($pv->verification) && $pv->verification->isVerified()): ?>
-      <?= __d('result', 'Verifications.status', [
-        VerificationMethodEnum::getLocalization($pv->verification->method),
-        $this->Time->nice($pv->verification->verification_time, $vv_tz)
-      ]) ?>
-    <?php else: ?>
-      <span class="mr-1 badge bg-warning unverified"><?= __d('field','unverified') ?></span>
-    <?php endif; ?>
-    </li>
-  <?php endforeach; ?>
-  </ul>
-<?php endif; ?>
\ No newline at end of file
diff --git a/app/plugins/CoreEnroller/templates/element/petition/identifierCollectorsStep.php b/app/plugins/CoreEnroller/templates/element/petition/identifierCollectorsStep.php
deleted file mode 100644
index f486c6e19..000000000
--- a/app/plugins/CoreEnroller/templates/element/petition/identifierCollectorsStep.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$PetitionIdentifiers = $this->Petition->getTable('CoreEnroller.PetitionIdentifiers');
-
-$vv_pi = $PetitionIdentifiers->find()->where(['petition_id' => $vv_obj->id])->first();
-
-if(!empty($vv_pi->identifier)) {
-  print __d('core_enroller', 'result.IdentifierCollector.collected', [$vv_pi->identifier]);
-}
\ No newline at end of file
diff --git a/app/plugins/CoreEnroller/templates/element/petition/invitationAcceptersStep.php b/app/plugins/CoreEnroller/templates/element/petition/invitationAcceptersStep.php
deleted file mode 100644
index b3ba8f668..000000000
--- a/app/plugins/CoreEnroller/templates/element/petition/invitationAcceptersStep.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-$PetitionAcceptances = $this->Petition->getTable('CoreEnroller.PetitionAcceptances');
-
-$vv_pa = $PetitionAcceptances->find()->where(['petition_id' => $vv_obj->id])->first();
-
-?>
-
-<ul>
-  <li>
-    <?php
-    if(!empty($vv_pa)) {
-      if($vv_pa['accepted']) {
-        print __d('core_enroller', 'result.InvitationAccepters.accepted', [$vv_pa['modified']]);
-      } else {
-        print __d('core_enroller', 'result.InvitationAccepters.declined', [$vv_pa['modified']]);
-      }
-    } else {
-      print __d('core_enroller', 'result.InvitationAccepters.none');
-    }
-    ?>
-  </li>
-</ul>
-
diff --git a/app/plugins/CoreEnroller/tests/TestCase/View/Cell/AttributeCollectorsCellTest.php b/app/plugins/CoreEnroller/tests/TestCase/View/Cell/AttributeCollectorsCellTest.php
new file mode 100644
index 000000000..1bddbdcef
--- /dev/null
+++ b/app/plugins/CoreEnroller/tests/TestCase/View/Cell/AttributeCollectorsCellTest.php
@@ -0,0 +1,70 @@
+<?php
+declare(strict_types=1);
+
+namespace CoreEnroller\Test\TestCase\View\Cell;
+
+use Cake\TestSuite\TestCase;
+use CoreEnroller\View\Cell\AttributeCollectorsCell;
+
+/**
+ * CoreEnroller\View\Cell\AttributeCollectorsCell Test Case
+ */
+class AttributeCollectorsCellTest extends TestCase
+{
+    /**
+     * Request mock
+     *
+     * @var \Cake\Http\ServerRequest|\PHPUnit\Framework\MockObject\MockObject
+     */
+    protected $request;
+
+    /**
+     * Response mock
+     *
+     * @var \Cake\Http\Response|\PHPUnit\Framework\MockObject\MockObject
+     */
+    protected $response;
+
+    /**
+     * Test subject
+     *
+     * @var \CoreEnroller\View\Cell\AttributeCollectorsCell
+     */
+    protected $AttributeCollectors;
+
+    /**
+     * setUp method
+     *
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->request = $this->getMockBuilder('Cake\Http\ServerRequest')->getMock();
+        $this->response = $this->getMockBuilder('Cake\Http\Response')->getMock();
+        $this->AttributeCollectors = new AttributeCollectorsCell($this->request, $this->response);
+    }
+
+    /**
+     * tearDown method
+     *
+     * @return void
+     */
+    protected function tearDown(): void
+    {
+        unset($this->AttributeCollectors);
+
+        parent::tearDown();
+    }
+
+    /**
+     * Test display method
+     *
+     * @return void
+     * @uses \CoreEnroller\View\Cell\AttributeCollectorsCell::display()
+     */
+    public function testDisplay(): void
+    {
+        $this->markTestIncomplete('Not implemented yet.');
+    }
+}
diff --git a/app/plugins/CoreEnroller/tests/TestCase/View/Cell/BasicAttributeCollectorsCellTest.php b/app/plugins/CoreEnroller/tests/TestCase/View/Cell/BasicAttributeCollectorsCellTest.php
new file mode 100644
index 000000000..2351dd505
--- /dev/null
+++ b/app/plugins/CoreEnroller/tests/TestCase/View/Cell/BasicAttributeCollectorsCellTest.php
@@ -0,0 +1,70 @@
+<?php
+declare(strict_types=1);
+
+namespace CoreEnroller\Test\TestCase\View\Cell;
+
+use Cake\TestSuite\TestCase;
+use CoreEnroller\View\Cell\BasicAttributeCollectorsCell;
+
+/**
+ * CoreEnroller\View\Cell\BasicAttributeCollectorsCell Test Case
+ */
+class BasicAttributeCollectorsCellTest extends TestCase
+{
+    /**
+     * Request mock
+     *
+     * @var \Cake\Http\ServerRequest|\PHPUnit\Framework\MockObject\MockObject
+     */
+    protected $request;
+
+    /**
+     * Response mock
+     *
+     * @var \Cake\Http\Response|\PHPUnit\Framework\MockObject\MockObject
+     */
+    protected $response;
+
+    /**
+     * Test subject
+     *
+     * @var \CoreEnroller\View\Cell\BasicAttributeCollectorsCell
+     */
+    protected $BasicAttributeCollectors;
+
+    /**
+     * setUp method
+     *
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->request = $this->getMockBuilder('Cake\Http\ServerRequest')->getMock();
+        $this->response = $this->getMockBuilder('Cake\Http\Response')->getMock();
+        $this->BasicAttributeCollectors = new BasicAttributeCollectorsCell($this->request, $this->response);
+    }
+
+    /**
+     * tearDown method
+     *
+     * @return void
+     */
+    protected function tearDown(): void
+    {
+        unset($this->BasicAttributeCollectors);
+
+        parent::tearDown();
+    }
+
+    /**
+     * Test display method
+     *
+     * @return void
+     * @uses \CoreEnroller\View\Cell\BasicAttributeCollectorsCell::display()
+     */
+    public function testDisplay(): void
+    {
+        $this->markTestIncomplete('Not implemented yet.');
+    }
+}
diff --git a/app/plugins/CoreEnroller/tests/TestCase/View/Cell/EmailVerifiersCellTest.php b/app/plugins/CoreEnroller/tests/TestCase/View/Cell/EmailVerifiersCellTest.php
new file mode 100644
index 000000000..660522a72
--- /dev/null
+++ b/app/plugins/CoreEnroller/tests/TestCase/View/Cell/EmailVerifiersCellTest.php
@@ -0,0 +1,70 @@
+<?php
+declare(strict_types=1);
+
+namespace CoreEnroller\Test\TestCase\View\Cell;
+
+use Cake\TestSuite\TestCase;
+use CoreEnroller\View\Cell\EmailVerifiersCell;
+
+/**
+ * CoreEnroller\View\Cell\EmailVerifiersCell Test Case
+ */
+class EmailVerifiersCellTest extends TestCase
+{
+    /**
+     * Request mock
+     *
+     * @var \Cake\Http\ServerRequest|\PHPUnit\Framework\MockObject\MockObject
+     */
+    protected $request;
+
+    /**
+     * Response mock
+     *
+     * @var \Cake\Http\Response|\PHPUnit\Framework\MockObject\MockObject
+     */
+    protected $response;
+
+    /**
+     * Test subject
+     *
+     * @var \CoreEnroller\View\Cell\EmailVerifiersCell
+     */
+    protected $EmailVerifiers;
+
+    /**
+     * setUp method
+     *
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->request = $this->getMockBuilder('Cake\Http\ServerRequest')->getMock();
+        $this->response = $this->getMockBuilder('Cake\Http\Response')->getMock();
+        $this->EmailVerifiers = new EmailVerifiersCell($this->request, $this->response);
+    }
+
+    /**
+     * tearDown method
+     *
+     * @return void
+     */
+    protected function tearDown(): void
+    {
+        unset($this->EmailVerifiers);
+
+        parent::tearDown();
+    }
+
+    /**
+     * Test display method
+     *
+     * @return void
+     * @uses \CoreEnroller\View\Cell\EmailVerifiersCell::display()
+     */
+    public function testDisplay(): void
+    {
+        $this->markTestIncomplete('Not implemented yet.');
+    }
+}
diff --git a/app/plugins/CoreEnroller/tests/TestCase/View/Cell/IdentifierCollectorsCellTest.php b/app/plugins/CoreEnroller/tests/TestCase/View/Cell/IdentifierCollectorsCellTest.php
new file mode 100644
index 000000000..5066e1ec0
--- /dev/null
+++ b/app/plugins/CoreEnroller/tests/TestCase/View/Cell/IdentifierCollectorsCellTest.php
@@ -0,0 +1,70 @@
+<?php
+declare(strict_types=1);
+
+namespace CoreEnroller\Test\TestCase\View\Cell;
+
+use Cake\TestSuite\TestCase;
+use CoreEnroller\View\Cell\IdentifierCollectorsCell;
+
+/**
+ * CoreEnroller\View\Cell\IdentifierCollectorsCell Test Case
+ */
+class IdentifierCollectorsCellTest extends TestCase
+{
+    /**
+     * Request mock
+     *
+     * @var \Cake\Http\ServerRequest|\PHPUnit\Framework\MockObject\MockObject
+     */
+    protected $request;
+
+    /**
+     * Response mock
+     *
+     * @var \Cake\Http\Response|\PHPUnit\Framework\MockObject\MockObject
+     */
+    protected $response;
+
+    /**
+     * Test subject
+     *
+     * @var \CoreEnroller\View\Cell\IdentifierCollectorsCell
+     */
+    protected $IdentifierCollectors;
+
+    /**
+     * setUp method
+     *
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->request = $this->getMockBuilder('Cake\Http\ServerRequest')->getMock();
+        $this->response = $this->getMockBuilder('Cake\Http\Response')->getMock();
+        $this->IdentifierCollectors = new IdentifierCollectorsCell($this->request, $this->response);
+    }
+
+    /**
+     * tearDown method
+     *
+     * @return void
+     */
+    protected function tearDown(): void
+    {
+        unset($this->IdentifierCollectors);
+
+        parent::tearDown();
+    }
+
+    /**
+     * Test display method
+     *
+     * @return void
+     * @uses \CoreEnroller\View\Cell\IdentifierCollectorsCell::display()
+     */
+    public function testDisplay(): void
+    {
+        $this->markTestIncomplete('Not implemented yet.');
+    }
+}
diff --git a/app/plugins/CoreEnroller/tests/TestCase/View/Cell/InvitationAcceptersCellTest.php b/app/plugins/CoreEnroller/tests/TestCase/View/Cell/InvitationAcceptersCellTest.php
new file mode 100644
index 000000000..96f34bcd8
--- /dev/null
+++ b/app/plugins/CoreEnroller/tests/TestCase/View/Cell/InvitationAcceptersCellTest.php
@@ -0,0 +1,70 @@
+<?php
+declare(strict_types=1);
+
+namespace CoreEnroller\Test\TestCase\View\Cell;
+
+use Cake\TestSuite\TestCase;
+use CoreEnroller\View\Cell\InvitationAcceptersCell;
+
+/**
+ * CoreEnroller\View\Cell\InvitationAcceptersCell Test Case
+ */
+class InvitationAcceptersCellTest extends TestCase
+{
+    /**
+     * Request mock
+     *
+     * @var \Cake\Http\ServerRequest|\PHPUnit\Framework\MockObject\MockObject
+     */
+    protected $request;
+
+    /**
+     * Response mock
+     *
+     * @var \Cake\Http\Response|\PHPUnit\Framework\MockObject\MockObject
+     */
+    protected $response;
+
+    /**
+     * Test subject
+     *
+     * @var \CoreEnroller\View\Cell\InvitationAcceptersCell
+     */
+    protected $InvitationAccepters;
+
+    /**
+     * setUp method
+     *
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->request = $this->getMockBuilder('Cake\Http\ServerRequest')->getMock();
+        $this->response = $this->getMockBuilder('Cake\Http\Response')->getMock();
+        $this->InvitationAccepters = new InvitationAcceptersCell($this->request, $this->response);
+    }
+
+    /**
+     * tearDown method
+     *
+     * @return void
+     */
+    protected function tearDown(): void
+    {
+        unset($this->InvitationAccepters);
+
+        parent::tearDown();
+    }
+
+    /**
+     * Test display method
+     *
+     * @return void
+     * @uses \CoreEnroller\View\Cell\InvitationAcceptersCell::display()
+     */
+    public function testDisplay(): void
+    {
+        $this->markTestIncomplete('Not implemented yet.');
+    }
+}
diff --git a/app/src/Model/Table/PersonRolesTable.php b/app/src/Model/Table/PersonRolesTable.php
index dc0ee791f..335ea96ba 100644
--- a/app/src/Model/Table/PersonRolesTable.php
+++ b/app/src/Model/Table/PersonRolesTable.php
@@ -296,12 +296,12 @@ public function beforeMarshal(EventInterface $event, \ArrayObject $data, \ArrayO
     $re = '/^.*\(ID: (\d+)\)$/m';
     // The data coming from the API is an int while the data coming from the UI is a string. The
     // latter is produced by the people picker
-    if(!empty($data['sponsor_person_id']) && !ctype_digit($data['sponsor_person_id'])) {
+    if(!empty($data['sponsor_person_id']) && !is_int($data['sponsor_person_id']) && !ctype_digit($data['sponsor_person_id'])) {
       preg_match_all($re, $data['sponsor_person_id'], $matchesSponsor, PREG_SET_ORDER, 0);
       $data['sponsor_person_id'] = $matchesSponsor[0][1];
     }
 
-    if(!empty($data['manager_person_id']) && !ctype_digit($data['manager_person_id'])) {
+    if(!empty($data['manager_person_id']) && !is_int($data['manager_person_id']) && !ctype_digit($data['manager_person_id'])) {
       preg_match_all($re, $data['manager_person_id'], $matchesManager, PREG_SET_ORDER, 0);
       $data['manager_person_id'] = $matchesManager[0][1];
     }
diff --git a/app/templates/Petitions/fields.inc b/app/templates/Petitions/fields.inc
index 78d64075f..664cb444f 100644
--- a/app/templates/Petitions/fields.inc
+++ b/app/templates/Petitions/fields.inc
@@ -283,12 +283,7 @@ if (!empty($vv_obj?->petitioner_person?->id)) {
     </div>
     <div id="collapse-box-<?= $step->id ?>" class="petition-attrs collapse">
       <h3><?= $step->plugin ?></h3>
-      <?php
-        [$pluginName, $pluginClass] = explode('.', $step->plugin);
-        $elementName = lcfirst($pluginClass) . 'Step';
-
-        print $this->element("$pluginName.petition/$elementName", ['vv_step' => $step]);
-      ?>
+      <?= $this->cell($step->plugin, [$vv_obj->id], ['vv_obj' => $vv_obj, 'vv_step' => $step, 'viewVars' => $this->viewVars]) ?>
     </div>
   </li>
 <?php endforeach; ?>