diff --git a/app/resources/locales/en_US/information.po b/app/resources/locales/en_US/information.po
index dba961a1a..fa0fe170c 100644
--- a/app/resources/locales/en_US/information.po
+++ b/app/resources/locales/en_US/information.po
@@ -56,3 +56,6 @@ msgstr "Page {{page}} of {{pages}}, Viewing {{start}}-{{end}} of {{count}}"
 
 msgid "global.records.none"
 msgstr "There are no records to display."
+
+msgid "global.title.none"
+msgstr "No title"
diff --git a/app/src/Controller/StandardController.php b/app/src/Controller/StandardController.php
index d28792885..43685c882 100644
--- a/app/src/Controller/StandardController.php
+++ b/app/src/Controller/StandardController.php
@@ -329,6 +329,8 @@ public function edit(string $id) {
       
       $this->set('vv_title', __d('operation', 'edit.ai', $table->generateDisplayField($obj)));
       $this->set('vv_supertitle', $table->generateDisplayField($obj));
+      // Pass the display field also into subtitle for dealing with External IDs
+      $this->set('vv_subtitle', $table->generateDisplayField($obj));
     } else {
       // Default view title is edit object display field
       $field = $table->getDisplayField();
diff --git a/app/templates/EmailAddresses/fields-nav.inc b/app/templates/EmailAddresses/fields-nav.inc
index 157ea46fc..14b677975 100644
--- a/app/templates/EmailAddresses/fields-nav.inc
+++ b/app/templates/EmailAddresses/fields-nav.inc
@@ -30,6 +30,6 @@ $topLinks = [];
 
 $subnav = [
   'name' => 'person',
-  'active' => 'attributes',
+  'active' => 'attributes', // default for person. 'external identities' are special cased
   'subActive' => 'email_addresses'
 ];
\ No newline at end of file
diff --git a/app/templates/ExternalIdentities/fields-nav.inc b/app/templates/ExternalIdentities/fields-nav.inc
new file mode 100644
index 000000000..569827598
--- /dev/null
+++ b/app/templates/ExternalIdentities/fields-nav.inc
@@ -0,0 +1,35 @@
+<?php
+/**
+ * COmanage Registry External Identity Edit Navigation
+ *
+ * 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.0.0
+ * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+ */
+
+// XXX: if CFM-218 (Make fields.inc configuration only) is accepted, move the contents of this file into fields.inc
+$topLinks = [];
+
+$subnav = [
+  'name' => 'person',
+  'active' => 'external_identities',
+  'subActive' => 'properties'
+];
\ No newline at end of file
diff --git a/app/templates/ExternalIdentityRoles/columns.inc b/app/templates/ExternalIdentityRoles/columns.inc
index 72d853f16..a911ae50b 100644
--- a/app/templates/ExternalIdentityRoles/columns.inc
+++ b/app/templates/ExternalIdentityRoles/columns.inc
@@ -44,6 +44,12 @@ $indexColumns = [
   ]
 ];
 
+$subnav = [
+  'name' => 'person',
+  'active' => 'external_identities',
+  'subActive' => 'external_identity_roles'
+];
+
 $bulkActions = [
   // TODO: develop bulk actions. For now, use a placeholder. 
   'delete' => true
diff --git a/app/templates/ExternalIdentityRoles/fields-nav.inc b/app/templates/ExternalIdentityRoles/fields-nav.inc
new file mode 100644
index 000000000..9b766b90b
--- /dev/null
+++ b/app/templates/ExternalIdentityRoles/fields-nav.inc
@@ -0,0 +1,35 @@
+<?php
+/**
+ * COmanage Registry External Identity Roles Navigation
+ *
+ * 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.0.0
+ * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+ */
+
+// XXX: if CFM-218 (Make fields.inc configuration only) is accepted, move the contents of this file into fields.inc
+$topLinks = [];
+
+$subnav = [
+  'name' => 'person',
+  'active' => 'external_identities',
+  'subActive' => 'external_identity_roles'
+];
\ No newline at end of file
diff --git a/app/templates/PersonRoles/fields-nav.inc b/app/templates/PersonRoles/fields-nav.inc
index 11932601d..e306f822c 100644
--- a/app/templates/PersonRoles/fields-nav.inc
+++ b/app/templates/PersonRoles/fields-nav.inc
@@ -30,5 +30,6 @@ $topLinks = [];
 
 $subnav = [
   'name' => 'person',
-  'active' => 'person_roles'
+  'active' => 'person_roles',
+  'subActive' => 'properties'
 ];
\ No newline at end of file
diff --git a/app/templates/Standard/add-edit-view.php b/app/templates/Standard/add-edit-view.php
index ffae2843c..cce8353c9 100644
--- a/app/templates/Standard/add-edit-view.php
+++ b/app/templates/Standard/add-edit-view.php
@@ -74,7 +74,18 @@
     <?php if(empty($subnav)): ?>
       <h1><?= $vv_title; ?></h1>
     <?php else: ?>
-      <h2><?= $vv_title; ?></h2>
+      <?php if(
+        // Subnavigation contains an h2 for these entities
+        $vv_primary_link == 'person_role_id'
+        || $vv_primary_link == 'external_identity_id'
+        || $vv_primary_link == 'external_identity_role_id'
+        || $this->request->getParam('controller') == 'PersonRoles'
+        || $this->request->getParam('controller') == 'ExternalIdentities'
+        || $this->request->getParam('controller') == 'ExternalIdentityRoles'): ?>
+        <h3><?= $vv_title; ?></h3>
+      <?php else: ?>
+        <h2><?= $vv_title; ?></h2>
+      <?php endif; ?>
     <?php endif; ?>
   </div>
   <?php
diff --git a/app/templates/Standard/index.php b/app/templates/Standard/index.php
index 0c06082d1..3a12f0525 100644
--- a/app/templates/Standard/index.php
+++ b/app/templates/Standard/index.php
@@ -80,7 +80,15 @@
     <?php if(empty($subnav)): ?>
       <h1><?= $vv_title; ?></h1>
     <?php else: ?>
-      <h2><?= $vv_title; ?></h2>
+      <?php if(
+        // Subnavigation contains an h2 for these entities
+        $vv_primary_link == 'person_role_id'
+        || $vv_primary_link == 'external_identity_id'
+        || $vv_primary_link == 'external_identity_role_id'): ?>
+        <h3><?= $vv_title; ?></h3>
+      <?php else: ?>
+        <h2><?= $vv_title; ?></h2>
+      <?php endif; ?>
     <?php endif; ?>
   </div>
 
diff --git a/app/templates/element/subnavigation.php b/app/templates/element/subnavigation.php
index f30a37277..93b9088b8 100644
--- a/app/templates/element/subnavigation.php
+++ b/app/templates/element/subnavigation.php
@@ -24,38 +24,92 @@
 * @since         COmanage Registry v5.0.0
 * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
 */
+use Cake\View\Helper;
 
 $linkFilter = [];
 $curId = NULL;
+$curController = $this->request->getParam('controller');
+$curAction = $this->request->getParam('action');
 
 if(!empty($vv_primary_link) && !empty($this->request->getQuery($vv_primary_link))) {
   // This will work for most index views
   $curId = $this->request->getQuery($vv_primary_link);
   $linkFilter = [$vv_primary_link => $curId];
+  // For top-level nav
+  if(!empty($vv_person_id)) {
+    $curId = $vv_person_id;
+    $linkFilter = ['person_id' => $vv_person_id];
+  }
 } elseif (!empty($vv_obj)) {
-  // This will work for most edit views
-  // XXX we might produce the $vv_primary_link for edit views so this approach could be deprecated
+  // This will work for most top-level edit views
+  // XXX we might produce the $vv_primary_link for edit views so the approach below could be deprecated
   $curId = $vv_obj->id;
+  if(!empty($vv_person_id)) {
+    $curId = $vv_person_id;
+  } else
   if(!empty($vv_primary_link_id)) {
     $curId = $vv_primary_link_id;
   }
+  // For top-level nav
   if ($name == 'person') {
     $linkFilter = ['person_id' => $curId];
-  }
-  if ($name == 'group') {
+  } elseif ($name == 'group') {
     $linkFilter = ['group_id' => $curId];
   }
 }
-?>
 
+// Simplify our tests for roles and external identifiers (in Person subnav)
+$isPersonRole = (
+  $vv_primary_link == 'person_role_id'
+  || $vv_primary_link == 'person_role_id'
+  || ($curController == 'PersonRoles' && ($curAction == 'edit' || $curAction == 'view'))
+) ? true : false;
+
+$isExternalIdRole = (
+  $vv_primary_link == 'external_identity_role_id'
+  || ($curController == 'ExternalIdentityRoles' && ($curAction == 'edit' || $curAction == 'view'))
+) ? true : false;
+
+$isExternalId = (
+  $vv_primary_link == 'external_identity_id'
+  || $vv_primary_link == 'external_identity_role_id'
+  || ($curController == 'ExternalIdentities' && ($curAction == 'edit' || $curAction == 'view'))
+  || ($curController == 'ExternalIdentityRoles' && ($curAction == 'edit' || $curAction == 'view'))
+) ? true : false;
+
+?>
+  
+<!-- Top-Level Subnavigation Tabs -->  
 <nav id="cm-<?= $name ?>-subnav-tabs" class="cm-subnav-tabs">
   <ul class="nav nav-tabs">
 
-    <?php if ($name == 'person'): ?>
+    <?php if ($name == 'person'): ?>      
       <!-- Person Subnavigation -->
+      <?php
+        // Determine active tab. This logic is necessitated by MVEAs (that are displayed in multiple contexts).
+        $isPropertiesTab = ($active == 'properties') ? true : false;
+        
+        $isAttributesTab = (
+          $active == 'attributes' 
+          && !$isPersonRole
+          && !$isExternalId
+        ) ? true : false;
+        
+        $isRolesTab = (
+          $active == 'person_roles'
+          || $isPersonRole
+          && !$isExternalId
+        ) ? true : false;
+        
+        $isExternalIdentitiesTab = (
+          $active == 'external_identities' 
+          || $isExternalId
+        ) ? true : false;
+      ?>
+      
       <li class="nav-item">
         <?php
-          $linkClass = ($active == 'properties') ? 'nav-link active' : 'nav-link';
+          $linkClass = ($isPropertiesTab) ? 'nav-link active' : 'nav-link';
           print $this->Html->link(
             __d('controller', 'Properties', [99]),
             [ 'controller' => 'people',
@@ -68,7 +122,7 @@
       </li>
       <li class="nav-item">
         <?php
-          $linkClass = ($active == 'attributes') ? 'nav-link active' : 'nav-link';
+          $linkClass = ($isAttributesTab) ? 'nav-link active' : 'nav-link';
           print $this->Html->link(
             __d('menu', 'Attributes', [99]),
             [ 'controller' => 'names',
@@ -81,7 +135,7 @@
       </li>
       <li class="nav-item">
         <?php
-          $linkClass = ($active == 'person_roles') ? 'nav-link active' : 'nav-link';
+          $linkClass = $isRolesTab ? 'nav-link active' : 'nav-link';
           print $this->Html->link(
             __d('controller', 'PersonRoles', [99]),
             [ 'controller' => 'person_roles',
@@ -94,7 +148,7 @@
       </li>
       <li class="nav-item">
         <?php
-          $linkClass = ($active == 'external_identities') ? 'nav-link active' : 'nav-link';
+          $linkClass = ($isExternalIdentitiesTab) ? 'nav-link active' : 'nav-link';
           print $this->Html->link(
             __d('controller', 'ExternalIdentities', [99]),
             [ 'controller' => 'external-identities',
@@ -164,53 +218,144 @@
     <?php endif; ?>
   </ul>
 </nav>
-
+  
 <?php if(!empty($subActive)): ?>
+<!-- Second Level Subnavigation Links -->
+  <?php
+    $curId = $this->request->getQuery($vv_primary_link);
+    if($isPersonRole || $isExternalId) {
+      if($isExternalId && !empty($vv_ei_id)) {
+        $curId = $vv_ei_id;
+      }
+      // We display the role or external identity name above the subnav to show the hierarchy.
+      // Use this branch to also set the second-level $linkFilter
+      print '<h2>';
+      if(!empty($vv_ei_name)) {
+        // We have an external identity name
+        print $vv_ei_name->full_name;
+        $linkFilter = ['external_identity_id' => $curId];
+      } elseif(!empty($vv_person_role)) {
+        // We have a person role
+        print $vv_person_role;
+        $linkFilter = ['person_role_id' => $curId];
+      } elseif(!empty($vv_obj)) {
+        // We are editing/viewing an object
+        if(!empty($vv_obj->title)) {
+          print $vv_obj->title;
+        } elseif (!empty($vv_subtitle)) {
+          print $vv_subtitle;
+        } else {
+          print print __d('information','global.title.none');
+        }
+        // Set up $linkFilter for edit/view on Roles and External Identities
+        $curId = $vv_obj->id;
+        if($curController == 'PersonRoles') {
+          $linkFilter = ['person_role_id' => $curId];
+        }
+        if($curController == 'ExternalIdentities') {
+          $linkFilter = ['external_identity_id' => $curId];
+        }
+        if($curController == 'ExternalIdentityRoles') {
+          $linkFilter = ['external_identity_role_id' => $curId];
+        }
+      } else {
+        // We shouldn't get here, but have a deafult in case.
+        print __d('information','global.title.none');
+      }
+      print '</h2>'; 
+    }
+  ?>
   <nav id="cm-<?= $name ?>-subnav-links" class="cm-subnav-links">
     <ul class="list-inline">
-      <?php if ($name == 'person'): ?>
-        <li class="list-inline-item">
-          <?php
-            $linkClass = ($subActive == 'names') ? 'nav-link active' : 'nav-link';
-            print $this->Html->link(
-              __d('controller', 'Names', [99]),
-              [ 'controller' => 'names',
-                'action' => 'index',
-                '?' => $linkFilter
-              ],
-              ['class' => $linkClass]
-           );
-          ?>
-        </li>
+      <?php if($name == 'person'): ?>
+        <?php if($isPersonRole || $isExternalId): ?>
+          <li class="list-inline-item">
+            <?php
+              // Properties
+              $cc = 'person-roles';
+              $cid = !empty($vv_person_role_id) ? $vv_person_role_id : $curId;
+              if($isExternalId) {
+                $cc = 'external-identities';
+                if(!empty($vv_ei_id)) {
+                  $cid = $vv_ei_id;  
+                }
+              }
+              $linkClass = ($subActive == 'properties') ? 'nav-link active' : 'nav-link';
+              print $this->Html->link(
+                __d('controller', 'Properties', [99]),
+                [ 'controller' => $cc,
+                  'action' => 'edit',
+                  $cid
+                ],
+                ['class' => $linkClass]
+              );
+            ?>
+          </li>
+        <?php endif; ?>
+        <?php if(!$isPersonRole): ?>
+          <li class="list-inline-item">
+            <?php
+              // Names
+              $linkClass = ($subActive == 'names') ? 'nav-link active' : 'nav-link';
+              print $this->Html->link(
+                __d('controller', 'Names', [99]),
+                [ 'controller' => 'names',
+                  'action' => 'index',
+                  '?' => $linkFilter
+                ],
+                ['class' => $linkClass]
+             );
+            ?>
+          </li>
+          <li class="list-inline-item">
+            <?php
+              // Email Addresses
+              $linkClass = ($subActive == 'email_addresses') ? 'nav-link active' : 'nav-link';
+              print $this->Html->link(
+                __d('controller', 'EmailAddresses', [99]),
+                [ 'controller' => 'email_addresses',
+                  'action' => 'index',
+                  '?' => $linkFilter
+                ],
+                ['class' => $linkClass]
+              );
+            ?>  
+          </li>
+          <li class="list-inline-item">
+            <?php
+              // Identifiers
+              $linkClass = ($subActive == 'identifiers') ? 'nav-link active' : 'nav-link';
+              print $this->Html->link(
+                __d('controller', 'Identifiers', [99]),
+                [ 'controller' => 'identifiers',
+                  'action' => 'index',
+                  '?' => $linkFilter
+                ],
+                ['class' => $linkClass]
+              );
+            ?>
+          </li>
+          <?php if($isExternalId): ?>
+            <li class="list-inline-item">
+              <?php
+                // External Identity Roles
+                $linkClass = ($subActive == 'external_identity_roles' ||  $isExternalIdRole) ? 'nav-link active' : 'nav-link';
+                print $this->Html->link(
+                  __d('controller', 'ExternalIdentityRoles', [99]),
+                  [ 'controller' => 'external_identity_roles',
+                    'action' => 'index',
+                    '?' => $linkFilter
+                  ],
+                  ['class' => $linkClass]
+                );
+              ?>
+            </li>
+          <?php endif; ?>
+        <?php endif; ?>
         <li class="list-inline-item">
           <?php
-            $linkClass = ($subActive == 'email_addresses') ? 'nav-link active' : 'nav-link';
-            print $this->Html->link(
-              __d('controller', 'EmailAddresses', [99]),
-              [ 'controller' => 'email_addresses',
-                'action' => 'index',
-                '?' => $linkFilter
-              ],
-              ['class' => $linkClass]
-            );
-          ?>  
-        </li>
-        <li class="list-inline-item">
-          <?php
-            $linkClass = ($subActive == 'identifiers') ? 'nav-link active' : 'nav-link';
-            print $this->Html->link(
-              __d('controller', 'Identifiers', [99]),
-              [ 'controller' => 'identifiers',
-                'action' => 'index',
-                '?' => $linkFilter
-              ],
-              ['class' => $linkClass]
-            );
-          ?>
-        </li>
-        <li class="list-inline-item">
-          <?php
-            $linkClass = ($subActive == 'ad_hoc_attributes') ? 'nav-link active' : 'nav-link';
+            // Ad-Hoc Attributes
+            $linkClass = ($subActive == 'ad_hoc_attributes' && !($isExternalIdRole)) ? 'nav-link active' : 'nav-link';
             print $this->Html->link(
               __d('controller', 'AdHocAttributes', [99]),
               [ 'controller' => 'ad_hoc_attributes',
@@ -223,7 +368,8 @@
         </li>
         <li class="list-inline-item">
           <?php
-            $linkClass = ($subActive == 'addresses') ? 'nav-link active' : 'nav-link';
+            // Addresses
+            $linkClass = ($subActive == 'addresses' && !($isExternalIdRole)) ? 'nav-link active' : 'nav-link';
             print $this->Html->link(
               __d('controller', 'Addresses', [99]),
               [ 'controller' => 'addresses',
@@ -236,7 +382,8 @@
         </li>
         <li class="list-inline-item">
           <?php
-            $linkClass = ($subActive == 'telephone_numbers') ? 'nav-link active' : 'nav-link';
+            // Telephone Numbers
+            $linkClass = ($subActive == 'telephone_numbers' && !($isExternalIdRole)) ? 'nav-link active' : 'nav-link';
             print $this->Html->link(
               __d('controller', 'TelephoneNumbers', [99]),
               [ 'controller' => 'telephone_numbers',
@@ -247,20 +394,120 @@
             );
           ?>
         </li>
-        <li class="list-inline-item">
-          <?php
-            $linkClass = ($subActive == 'urls') ? 'nav-link active' : 'nav-link';
-            print $this->Html->link(
-              __d('controller', 'Urls', [99]),
-              [ 'controller' => 'urls',
-                'action' => 'index',
-                '?' => $linkFilter
-              ],
-              ['class' => $linkClass]
-            );
-          ?>
-        </li>
+        <?php if(!$isPersonRole): ?>
+          <li class="list-inline-item">
+            <?php
+              // URLs
+              $linkClass = ($subActive == 'urls') ? 'nav-link active' : 'nav-link';
+              print $this->Html->link(
+                __d('controller', 'Urls', [99]),
+                [ 'controller' => 'urls',
+                  'action' => 'index',
+                  '?' => $linkFilter
+                ],
+                ['class' => $linkClass]
+              );
+            ?>
+          </li>
+          <li class="list-inline-item">
+            <?php
+              // Pronouns
+              print $this->Html->link(
+                __d('controller', 'Pronouns', [99]),
+                [ 'controller' => 'pronouns',
+                  'action' => 'index',
+                  '?' => $linkFilter
+                ],
+                ['class' => $linkClass]
+              );
+            ?>
+          </li>
+        <?php endif; ?>
       <?php endif; ?>
     </ul>
   </nav>
+  <?php if($isExternalIdRole): ?>
+    <!-- Third-level subnavigation links -->
+    <div id="external-id-role">
+      <h3>
+        <?php 
+          // Set the link filter for External Identity Roles
+          $curId = $this->request->getQuery($vv_primary_link);
+          if(!empty($vv_obj)) {
+            $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 = ($subActive == 'properties') ? '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; ?>
 <?php endif; ?>
\ No newline at end of file
diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css
index 99d944280..640734aa4 100644
--- a/app/webroot/css/co-base.css
+++ b/app/webroot/css/co-base.css
@@ -54,8 +54,8 @@ h2 {
   margin: 0;
 }
 h3 {
-  font-size: 1.6em;
-  line-height: 1.6em;
+  font-size: 1.4em;
+  line-height: 1.4em;
   margin: 0;
 }
 a {
@@ -568,6 +568,26 @@ ul.form-list li.alert-banner .co-alert {
 .cm-subnav-links .nav-link.active {
   color: var(--cmg-color-gray-001);
 }
+.cm-subnav-links ul.list-inline {
+  margin: 0.5em 0 0 0;
+  font-size: 0.9em;
+}
+.cm-subnav-links .list-inline-item {
+  margin: 0;
+}
+.cm-subnav-links .list-inline-item a.nav-link {
+  padding: 0 1.5em 0.5em 0;
+}
+#external-id-role {
+  border-top: 1px solid var(--cmg-color-lightgray-006);
+}
+#external-id-role h3 {
+  padding: 0.5rem 1rem;
+  background-color: var(--cmg-color-lightgray-003);
+}
+#external-id-role-nav {
+  margin-left: 1rem;
+}
 /* INNER CONTENT - for non-table-based layouts */
 #content {
   padding: 2rem;