diff --git a/app/src/Model/Table/ExternalIdentityRolesTable.php b/app/src/Model/Table/ExternalIdentityRolesTable.php
index fb9f5275d..299284fa6 100644
--- a/app/src/Model/Table/ExternalIdentityRolesTable.php
+++ b/app/src/Model/Table/ExternalIdentityRolesTable.php
@@ -89,10 +89,9 @@ public function initialize(array $config): void {
     $this->setRedirectGoal('self');
     
     $this->setEditContains([
-      /*
       'Addresses',
       'AdHocAttributes',
-      'TelephoneNumbers'*/
+      'TelephoneNumbers'
     ]);
     
     $this->setAutoViewVars([
diff --git a/app/templates/ExternalIdentityRoles/fields-nav.inc b/app/templates/ExternalIdentityRoles/fields-nav.inc
index 9b766b90b..653919ff4 100644
--- a/app/templates/ExternalIdentityRoles/fields-nav.inc
+++ b/app/templates/ExternalIdentityRoles/fields-nav.inc
@@ -25,6 +25,39 @@
  * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
  */
 
+// List the MVEAs that may be shown on the mveaCanvas
+// When this array exists, the mveaCanvas.php element will render  
+$mveas = [
+  'ad_hoc_attributes',
+  'addresses',
+  'telephone_numbers'
+];
+
+// Name the MVEAs Entity Type
+$mveasEntityType = "external_identity_role";
+
+// $addMenuLinks is also given slightly different treatment from the typical $topLinks found in most views: 
+// it is a page-global menu used for adding MVEAs and is given special treatment in element/mveaCanvas.php.
+$addMenuLinks = [
+  [
+    'controller' => 'ad_hoc_attributes',
+    'action' => 'add',
+    'icon' => 'check_box',
+    'iconClass' => 'material-icons-outlined'
+  ],
+  [
+    'controller' => 'addresses',
+    'action' => 'add',
+    'icon' => 'contact_mail',
+    'iconClass' => 'material-icons-outlined'
+  ],
+  [
+    'controller' => 'telephone_numbers',
+    'action' => 'add',
+    'icon' => 'phone'
+  ]
+];
+
 // XXX: if CFM-218 (Make fields.inc configuration only) is accepted, move the contents of this file into fields.inc
 $topLinks = [];
 
diff --git a/app/templates/element/mveaCanvas.php b/app/templates/element/mveaCanvas.php
index 6645d2cd3..7da504939 100644
--- a/app/templates/element/mveaCanvas.php
+++ b/app/templates/element/mveaCanvas.php
@@ -91,7 +91,7 @@
   }
 ?>
 <div id="mvea-canvas" class="co-cards">
-  <div id="mvea-canvas-attributes-js" class="row row-cols-1 g-4 <?= ($widgetCount > 1) ? 'row-cols-md-2' : ''?>">
+  <div id="mvea-canvas-attributes-js" class="row row-cols-1 g-4<?= ($widgetCount > 1) ? ' row-cols-md-2' : ''?>">
     <?php
       foreach($attributes as $attr) {
         if(!empty(($vv_obj[$attr]))) {
diff --git a/app/templates/element/subnavigation.php b/app/templates/element/subnavigation.php
index 69380138d..6c1f79f81 100644
--- a/app/templates/element/subnavigation.php
+++ b/app/templates/element/subnavigation.php
@@ -368,93 +368,6 @@
       </ul>
     </nav>
     
-    <?php if($isExternalIdRole): ?>
-    <!-- Third-level subnavigation links - only for External Identity Roles  -->
-      <div id="external-id-role">
-        <h3>
-          <?php 
-            // Set the link filter for External Identity Roles
-            $curId = $vv_primary_link_obj->id;
-            if(!empty($vv_obj) && ($curController == 'ExternalIdentityRoles' && ($curAction == 'edit' || $curAction == 'view'))) {
-              $curId = $vv_obj->id;  
-            }
-            $linkFilter = ['external_identity_role_id' => $curId];
-            
-            if(!empty($vv_ei_role)) {
-              print $vv_ei_role;
-            } elseif(!empty($vv_obj->title)) {
-              print $vv_obj->title;
-            } else {
-              // As above, we shouldn't get here, but have a deafult in case.
-              print __d('information','global.title.none');
-            }
-          ?>  
-        </h3>
-        <nav id="external-id-role-nav" class="cm-subnav-links">
-          <ul class="list-inline">
-            <li class="list-inline-item">
-              <?php
-                // Properties
-                $linkClass = (
-                  $curController == 'ExternalIdentityRoles' 
-                  && ($curAction == 'edit' || $curAction == 'view')
-                ) ? 'nav-link active' : 'nav-link';
-                print $this->Html->link(
-                  __d('controller', 'Properties', [99]),
-                  [ 'controller' => 'external-identity-roles',
-                    'action' => 'edit',
-                    $curId
-                  ],
-                  ['class' => $linkClass]
-                );
-              ?>
-            </li>
-            <li class="list-inline-item">
-              <?php
-                // Ad-Hoc Attributes
-                $linkClass = ($subActive == 'ad_hoc_attributes') ? 'nav-link active' : 'nav-link';
-                print $this->Html->link(
-                  __d('controller', 'AdHocAttributes', [99]),
-                  [ 'controller' => 'ad_hoc_attributes',
-                    'action' => 'index',
-                    '?' => $linkFilter
-                  ],
-                  ['class' => $linkClass]
-                );
-              ?>
-            </li>
-            <li class="list-inline-item">
-              <?php
-                // Addresses
-                $linkClass = ($subActive == 'addresses') ? 'nav-link active' : 'nav-link';
-                print $this->Html->link(
-                  __d('controller', 'Addresses', [99]),
-                  [ 'controller' => 'addresses',
-                    'action' => 'index',
-                    '?' => $linkFilter
-                  ],
-                  ['class' => $linkClass]
-                );
-              ?>
-            </li>
-            <li class="list-inline-item">
-              <?php
-                // Telephone Numbers
-                $linkClass = ($subActive == 'telephone_numbers') ? 'nav-link active' : 'nav-link';
-                print $this->Html->link(
-                  __d('controller', 'TelephoneNumbers', [99]),
-                  [ 'controller' => 'telephone_numbers',
-                    'action' => 'index',
-                    '?' => $linkFilter
-                  ],
-                  ['class' => $linkClass]
-                );
-              ?>
-            </li>
-          </ul>  
-        </nav>
-      </div>
-    <?php endif; // end $isExternalIdRole ?>
   <?php endif; // end  $isExternalId ?>
 </div>
   
\ No newline at end of file