diff --git a/app/availableplugins/ApiConnector/src/Controller/ApiSourceEndpointsController.php b/app/availableplugins/ApiConnector/src/Controller/ApiSourceEndpointsController.php
index f9fe4da31..119202628 100644
--- a/app/availableplugins/ApiConnector/src/Controller/ApiSourceEndpointsController.php
+++ b/app/availableplugins/ApiConnector/src/Controller/ApiSourceEndpointsController.php
@@ -48,6 +48,14 @@ class ApiSourceEndpointsController extends StandardPluginController {
    */
 
   public function beforeRender(\Cake\Event\EventInterface $event) {
+    $link = $this->getPrimaryLink(true);
+
+    if(!empty($link->value)) {
+      $this->set('vv_bc_parent_obj', $this->ApiSourceEndpoints->Apis->get($link->value));
+      $this->set('vv_bc_parent_displayfield', $this->ApiSourceEndpoints->Apis->getDisplayField());
+      $this->set('vv_bc_parent_primarykey', $this->ApiSourceEndpoints->Apis->getPrimaryKey());
+    }
+    
     $vv_obj = $this->viewBuilder()->getVar('vv_obj');
 
     if(!empty($vv_obj->external_identity_source->api_source->id)) {
diff --git a/app/availableplugins/ApiConnector/src/Controller/ApiSourcesController.php b/app/availableplugins/ApiConnector/src/Controller/ApiSourcesController.php
index 75ff700c5..b779a9a65 100644
--- a/app/availableplugins/ApiConnector/src/Controller/ApiSourcesController.php
+++ b/app/availableplugins/ApiConnector/src/Controller/ApiSourcesController.php
@@ -29,6 +29,7 @@
 
 namespace ApiConnector\Controller;
 
+use Cake\Event\EventInterface;
 use Cake\Routing\Router;
 use App\Controller\StandardPluginController;
 
@@ -38,4 +39,25 @@ class ApiSourcesController extends StandardPluginController {
       'ApiSources.id' => 'asc'
     ]
   ];
+
+  /**
+   * Callback run prior to the request render.
+   *
+   * @param   EventInterface  $event  Cake Event
+   *
+   * @return Response|void
+   * @since  COmanage Registry v5.0.0
+   */
+
+  public function beforeRender(EventInterface $event) {
+    $link = $this->getPrimaryLink(true);
+
+    if(!empty($link->value)) {
+      $this->set('vv_bc_parent_obj', $this->ApiSources->ExternalIdentitySources->get($link->value));
+      $this->set('vv_bc_parent_displayfield', $this->ApiSources->ExternalIdentitySources->getDisplayField());
+      $this->set('vv_bc_parent_primarykey', $this->ApiSources->ExternalIdentitySources->getPrimaryKey());
+    }
+
+    return parent::beforeRender($event);
+  }
 }
diff --git a/app/availableplugins/ApiConnector/src/Model/Table/ApiSourcesTable.php b/app/availableplugins/ApiConnector/src/Model/Table/ApiSourcesTable.php
index 0cb1f6d72..07bfdfdfa 100644
--- a/app/availableplugins/ApiConnector/src/Model/Table/ApiSourcesTable.php
+++ b/app/availableplugins/ApiConnector/src/Model/Table/ApiSourcesTable.php
@@ -42,7 +42,6 @@ class ApiSourcesTable extends Table {
   use \App\Lib\Traits\PrimaryLinkTrait;
   use \App\Lib\Traits\TableMetaTrait;
   use \App\Lib\Traits\ValidationTrait;
-  use \App\Lib\Traits\TabTrait;
 
   /**
    * Perform Cake Model initialization.
diff --git a/app/availableplugins/ApiConnector/templates/ApiSourceEndpoints/fields.inc b/app/availableplugins/ApiConnector/templates/ApiSourceEndpoints/fields.inc
index 909625d5f..e3b79cfa3 100644
--- a/app/availableplugins/ApiConnector/templates/ApiSourceEndpoints/fields.inc
+++ b/app/availableplugins/ApiConnector/templates/ApiSourceEndpoints/fields.inc
@@ -38,3 +38,11 @@ if(!empty($vv_push_endpoint)) {
 $fields = [
   'external_identity_source_id'
 ];
+
+$subnav = [
+  'tabs' => ['Apis', 'ApiConnector.ApiSourceEndpoints'],
+  'action' => [
+    'Apis' => ['edit'],
+    'ApiConnector.ApiSourceEndpoints' => ['edit']
+  ]
+];
diff --git a/app/availableplugins/ApiConnector/templates/ApiSources/fields.inc b/app/availableplugins/ApiConnector/templates/ApiSources/fields.inc
index 32722bfa7..e3178098d 100644
--- a/app/availableplugins/ApiConnector/templates/ApiSources/fields.inc
+++ b/app/availableplugins/ApiConnector/templates/ApiSources/fields.inc
@@ -38,3 +38,12 @@ $fields = [
     'subtitle' => __d('api_connector', 'field.ApiSources.push_mode')
   ]
 ];
+
+$subnav = [
+  'tabs' => ['ExternalIdentitySources', 'ApiConnector.ApiSources', 'ExternalIdentitySources@action.search'],
+  'action' => [
+    'ExternalIdentitySources' => ['edit', 'view', 'search'],
+    'ApiConnector.ApiSources' => ['edit'],
+    'ExternalIdentitySources@action.search' => [],
+  ],
+];
diff --git a/app/availableplugins/FileConnector/src/Controller/FileProvisionersController.php b/app/availableplugins/FileConnector/src/Controller/FileProvisionersController.php
index 3fe2ebd9e..fed47b8e2 100644
--- a/app/availableplugins/FileConnector/src/Controller/FileProvisionersController.php
+++ b/app/availableplugins/FileConnector/src/Controller/FileProvisionersController.php
@@ -30,6 +30,7 @@
 namespace FileConnector\Controller;
 
 use App\Controller\StandardPluginController;
+use Cake\Event\EventInterface;
 
 class FileProvisionersController extends StandardPluginController {
   protected array $paginate = [
@@ -37,4 +38,25 @@ class FileProvisionersController extends StandardPluginController {
       'FileProvisioners.id' => 'asc'
     ]
   ];
+
+  /**
+   * Callback run prior to the request render.
+   *
+   * @param   EventInterface  $event  Cake Event
+   *
+   * @return Response|void
+   * @since  COmanage Registry v5.0.0
+   */
+
+  public function beforeRender(EventInterface $event) {
+    $link = $this->getPrimaryLink(true);
+
+    if(!empty($link->value)) {
+      $this->set('vv_bc_parent_obj', $this->FileProvisioners->ProvisioningTargets->get($link->value));
+      $this->set('vv_bc_parent_displayfield', $this->FileProvisioners->ProvisioningTargets->getDisplayField());
+      $this->set('vv_bc_parent_primarykey', $this->FileProvisioners->ProvisioningTargets->getPrimaryKey());
+    }
+
+    return parent::beforeRender($event);
+  }
 }
diff --git a/app/availableplugins/FileConnector/src/Model/Table/FileSourcesTable.php b/app/availableplugins/FileConnector/src/Model/Table/FileSourcesTable.php
index 5010d7267..ee57ddd7a 100644
--- a/app/availableplugins/FileConnector/src/Model/Table/FileSourcesTable.php
+++ b/app/availableplugins/FileConnector/src/Model/Table/FileSourcesTable.php
@@ -47,7 +47,6 @@ class FileSourcesTable extends Table {
   use \App\Lib\Traits\PrimaryLinkTrait;
   use \App\Lib\Traits\TableMetaTrait;
   use \App\Lib\Traits\ValidationTrait;
-  use \App\Lib\Traits\TabTrait;
 
   // Cache of the field configuration
   protected $fieldCfg = null;
@@ -89,23 +88,6 @@ public function initialize(array $config): void {
       ]
     ]);
 
-    // All the tabs share the same configuration in the ModelTable file
-    $this->setTabsConfig(
-      [
-        // Ordered list of Tabs
-        'tabs' => ['ExternalIdentitySources', 'FileConnector.FileSources', 'ExternalIdentitySources@action.search'],
-        // What actions will include the subnavigation header
-        'action' => [
-          // If a model renders in a subnavigation mode in edit/view mode, it cannot
-          // render in index mode for the same use case/context
-          // XXX edit should go first.
-          'ExternalIdentitySources' => ['edit', 'view', 'search'],
-          'FileConnector.FileSources' => ['edit'],
-          'ExternalIdentitySources@action.search' => [],
-        ],
-      ]
-    );
-
     $this->setPermissions([
       // Actions that operate over an entity (ie: require an $id)
       'entity' => [
diff --git a/app/availableplugins/FileConnector/templates/FileProvisioners/fields.inc b/app/availableplugins/FileConnector/templates/FileProvisioners/fields.inc
index ffecf0e93..c5eb0f373 100644
--- a/app/availableplugins/FileConnector/templates/FileProvisioners/fields.inc
+++ b/app/availableplugins/FileConnector/templates/FileProvisioners/fields.inc
@@ -27,4 +27,12 @@
 
 $fields = [
   'filename'
-];
\ No newline at end of file
+];
+
+$subnav = [
+  'tabs' => ['ProvisioningTargets', 'FileConnector.FileProvisioners'],
+  'action' => [
+    'ProvisioningTargets' => ['edit'],
+    'FileConnector.FileProvisioners' => ['edit']
+  ]
+];
diff --git a/app/availableplugins/FileConnector/templates/FileSources/fields.inc b/app/availableplugins/FileConnector/templates/FileSources/fields.inc
index 3fbde4e40..a9f4af3de 100644
--- a/app/availableplugins/FileConnector/templates/FileSources/fields.inc
+++ b/app/availableplugins/FileConnector/templates/FileSources/fields.inc
@@ -32,3 +32,12 @@ $fields = [
   'threshold_check',
   'threshold_override',
 ];
+
+$subnav = [
+  'tabs' => ['ExternalIdentitySources', 'FileConnector.FileSources', 'ExternalIdentitySources@action.search'],
+  'action' => [
+    'ExternalIdentitySources' => ['edit', 'view', 'search'],
+    'FileConnector.FileSources' => ['edit'],
+    'ExternalIdentitySources@action.search' => [],
+  ],
+];
diff --git a/app/availableplugins/KerberosConnector/src/Controller/KerberosServersController.php b/app/availableplugins/KerberosConnector/src/Controller/KerberosServersController.php
index 089b2ef8e..e818c8cb8 100644
--- a/app/availableplugins/KerberosConnector/src/Controller/KerberosServersController.php
+++ b/app/availableplugins/KerberosConnector/src/Controller/KerberosServersController.php
@@ -30,6 +30,7 @@
 namespace KerberosConnector\Controller;
 
 use App\Controller\StandardPluginController;
+use Cake\Event\EventInterface;
 
 class KerberosServersController extends StandardPluginController {
   protected array $paginate = [
@@ -37,4 +38,25 @@ class KerberosServersController extends StandardPluginController {
       'KerberosServers.hostname' => 'asc'
     ]
   ];
+
+  /**
+   * Callback run prior to the request render.
+   *
+   * @param   EventInterface  $event  Cake Event
+   *
+   * @return Response|void
+   * @since  COmanage Registry v5.0.0
+   */
+
+  public function beforeRender(EventInterface $event) {
+    $link = $this->getPrimaryLink(true);
+
+    if(!empty($link->value)) {
+      $this->set('vv_bc_parent_obj', $this->KerberosServers->Servers->get($link->value));
+      $this->set('vv_bc_parent_displayfield', $this->KerberosServers->Servers->getDisplayField());
+      $this->set('vv_bc_parent_primarykey', $this->KerberosServers->Servers->getPrimaryKey());
+    }
+
+    return parent::beforeRender($event);
+  }  
 }
diff --git a/app/availableplugins/KerberosConnector/templates/KerberosServers/fields.inc b/app/availableplugins/KerberosConnector/templates/KerberosServers/fields.inc
index d4f28daf4..8b9f5afbc 100644
--- a/app/availableplugins/KerberosConnector/templates/KerberosServers/fields.inc
+++ b/app/availableplugins/KerberosConnector/templates/KerberosServers/fields.inc
@@ -33,3 +33,10 @@ $fields = [
   'keytab_path'
 ];
 
+$subnav = [
+  'tabs' => ['Servers', 'KerberosConnector.KerberosServers'],
+  'action' => [
+    'Servers' => ['edit'],
+    'KerberosConnector.KerberosServers' => ['edit']
+  ]
+];
diff --git a/app/availableplugins/PasswordAuthenticator/src/Controller/PasswordAuthenticatorsController.php b/app/availableplugins/PasswordAuthenticator/src/Controller/PasswordAuthenticatorsController.php
index 06dba901f..cf0692b5b 100644
--- a/app/availableplugins/PasswordAuthenticator/src/Controller/PasswordAuthenticatorsController.php
+++ b/app/availableplugins/PasswordAuthenticator/src/Controller/PasswordAuthenticatorsController.php
@@ -30,6 +30,7 @@
 namespace PasswordAuthenticator\Controller;
 
 use App\Controller\StandardPluginController;
+use Cake\Event\EventInterface;
 
 class PasswordAuthenticatorsController extends StandardPluginController {
   protected array $paginate = [
@@ -37,4 +38,25 @@ class PasswordAuthenticatorsController extends StandardPluginController {
       'PasswordAuthenticators.id' => 'asc'
     ]
   ];
+
+  /**
+   * Callback run prior to the request render.
+   *
+   * @param   EventInterface  $event  Cake Event
+   *
+   * @return Response|void
+   * @since  COmanage Registry v5.0.0
+   */
+
+  public function beforeRender(EventInterface $event) {
+    $link = $this->getPrimaryLink(true);
+
+    if(!empty($link->value)) {
+      $this->set('vv_bc_parent_obj', $this->PasswordAuthenticators->Authenticators->get($link->value));
+      $this->set('vv_bc_parent_displayfield', $this->PasswordAuthenticators->Authenticators->getDisplayField());
+      $this->set('vv_bc_parent_primarykey', $this->PasswordAuthenticators->Authenticators->getPrimaryKey());
+    }
+
+    return parent::beforeRender($event);
+  }
 }
diff --git a/app/availableplugins/PasswordAuthenticator/templates/PasswordAuthenticators/fields.inc b/app/availableplugins/PasswordAuthenticator/templates/PasswordAuthenticators/fields.inc
index bf1640b56..59452354b 100644
--- a/app/availableplugins/PasswordAuthenticator/templates/PasswordAuthenticators/fields.inc
+++ b/app/availableplugins/PasswordAuthenticator/templates/PasswordAuthenticators/fields.inc
@@ -34,6 +34,14 @@ $fields = [
   'format_plaintext'
 ];
 
+$subnav = [
+  'tabs' => ['Authenticators', 'PasswordAuthenticator.PasswordAuthenticators'],
+  'action' => [
+    'Authenticators' => ['edit'],
+    'PasswordAuthenticator.PasswordAuthenticators' => ['edit']
+  ]
+]
+  
 ?>
   
 <script>
diff --git a/app/availableplugins/SqlConnector/src/Controller/SqlProvisionersController.php b/app/availableplugins/SqlConnector/src/Controller/SqlProvisionersController.php
index e6aef1dd2..f700a31c5 100644
--- a/app/availableplugins/SqlConnector/src/Controller/SqlProvisionersController.php
+++ b/app/availableplugins/SqlConnector/src/Controller/SqlProvisionersController.php
@@ -30,6 +30,7 @@
 namespace SqlConnector\Controller;
 
 use App\Controller\StandardPluginController;
+use Cake\Event\EventInterface;
 
 class SqlProvisionersController extends StandardPluginController {
   protected array $paginate = [
@@ -38,6 +39,27 @@ class SqlProvisionersController extends StandardPluginController {
     ]
   ];
 
+  /**
+   * Callback run prior to the request render.
+   *
+   * @param   EventInterface  $event  Cake Event
+   *
+   * @return Response|void
+   * @since  COmanage Registry v5.0.0
+   */
+
+  public function beforeRender(EventInterface $event) {
+    $link = $this->getPrimaryLink(true);
+
+    if(!empty($link->value)) {
+      $this->set('vv_bc_parent_obj', $this->SqlProvisioners->ProvisioningTargets->get($link->value));
+      $this->set('vv_bc_parent_displayfield', $this->SqlProvisioners->ProvisioningTargets->getDisplayField());
+      $this->set('vv_bc_parent_primarykey', $this->SqlProvisioners->ProvisioningTargets->getPrimaryKey());
+    }
+
+    return parent::beforeRender($event);
+  }
+
   /**
    * Reapply the target database schema.
    *
diff --git a/app/availableplugins/SqlConnector/src/Model/Table/SqlSourcesTable.php b/app/availableplugins/SqlConnector/src/Model/Table/SqlSourcesTable.php
index 9d71f7d51..1bbf353f5 100644
--- a/app/availableplugins/SqlConnector/src/Model/Table/SqlSourcesTable.php
+++ b/app/availableplugins/SqlConnector/src/Model/Table/SqlSourcesTable.php
@@ -46,7 +46,6 @@ class SqlSourcesTable extends Table {
   use \App\Lib\Traits\PermissionsTrait;
   use \App\Lib\Traits\PrimaryLinkTrait;
   use \App\Lib\Traits\QueryModificationTrait;
-  use \App\Lib\Traits\TabTrait;
   use \App\Lib\Traits\TableMetaTrait;
   use \App\Lib\Traits\ValidationTrait;
 
@@ -157,23 +156,6 @@ public function initialize(array $config): void {
       ]
     ]);
 
-    // All the tabs share the same configuration in the ModelTable file
-    $this->setTabsConfig(
-      [
-        // Ordered list of Tabs
-        'tabs' => ['ExternalIdentitySources', 'SqlConnector.SqlSources', 'ExternalIdentitySources@action.search'],
-        // What actions will include the subnavigation header
-        'action' => [
-          // If a model renders in a subnavigation mode in edit/view mode, it cannot
-          // render in index mode for the same use case/context
-          // XXX edit should go first.
-          'ExternalIdentitySources' => ['edit', 'view', 'search'],
-          'SqlConnector.SqlSources' => ['edit'],
-          'ExternalIdentitySources@action.search' => [],
-        ],
-      ]
-    );
-
     $this->setPermissions([
       // Actions that operate over an entity (ie: require an $id)
       'entity' => [
diff --git a/app/availableplugins/SqlConnector/templates/SqlProvisioners/fields.inc b/app/availableplugins/SqlConnector/templates/SqlProvisioners/fields.inc
index d398d50ee..f82265102 100644
--- a/app/availableplugins/SqlConnector/templates/SqlProvisioners/fields.inc
+++ b/app/availableplugins/SqlConnector/templates/SqlProvisioners/fields.inc
@@ -32,6 +32,14 @@ $fields = [
   ]
 ];
 
+$subnav = [
+  'tabs' => ['ProvisioningTargets', 'SqlConnector.SqlProvisioners'],
+  'action' => [
+    'ProvisioningTargets' => ['edit'],
+    'SqlConnector.SqlProvisioners' => ['edit']
+  ]
+];
+
 // Top Links
 $topLinks = [
   [
diff --git a/app/availableplugins/SqlConnector/templates/SqlSources/fields.inc b/app/availableplugins/SqlConnector/templates/SqlSources/fields.inc
index 3edf79011..2081bf11b 100644
--- a/app/availableplugins/SqlConnector/templates/SqlSources/fields.inc
+++ b/app/availableplugins/SqlConnector/templates/SqlSources/fields.inc
@@ -52,6 +52,15 @@ $fields = array_merge($fields, [
   'threshold_override'
 ]);
 
+$subnav = [
+  'tabs' => ['ExternalIdentitySources', 'SqlConnector.SqlSources', 'ExternalIdentitySources@action.search'],
+  'action' => [
+    'ExternalIdentitySources' => ['edit', 'view', 'search'],
+    'SqlConnector.SqlSources' => ['edit'],
+    'ExternalIdentitySources@action.search' => [],
+  ],
+];
+
 ?>
 
 <script>
diff --git a/app/plugins/CoreApi/src/Controller/MatchCallbacksController.php b/app/plugins/CoreApi/src/Controller/MatchCallbacksController.php
index 8dc370373..ca18887cb 100644
--- a/app/plugins/CoreApi/src/Controller/MatchCallbacksController.php
+++ b/app/plugins/CoreApi/src/Controller/MatchCallbacksController.php
@@ -49,8 +49,15 @@ class MatchCallbacksController extends StandardPluginController {
    */
 
   public function beforeRender(EventInterface $event) {
-    // Generate the callback URL
+    $link = $this->getPrimaryLink(true);
+
+    if(!empty($link->value)) {
+      $this->set('vv_bc_parent_obj', $this->MatchCallbacks->Apis->get($link->value));
+      $this->set('vv_bc_parent_displayfield', $this->MatchCallbacks->Apis->getDisplayField());
+      $this->set('vv_bc_parent_primarykey', $this->MatchCallbacks->Apis->getPrimaryKey());
+    }
     
+    // Generate the callback URL
     $this->set('vv_api_endpoint', \Cake\Routing\Router::url('/', true) . 'api/match/' . $this->getCOID() . '/v1/resolution');
 
     return parent::beforeRender($event);
diff --git a/app/plugins/CoreApi/templates/MatchCallbacks/fields.inc b/app/plugins/CoreApi/templates/MatchCallbacks/fields.inc
index b348baefd..4f17564f4 100644
--- a/app/plugins/CoreApi/templates/MatchCallbacks/fields.inc
+++ b/app/plugins/CoreApi/templates/MatchCallbacks/fields.inc
@@ -36,4 +36,12 @@ if(!empty($vv_api_endpoint)) {
 
 $fields = [
   'server_id'
-];
\ No newline at end of file
+];
+
+$subnav = [
+  'tabs' => ['Apis', 'CoreApi.MatchCallbacks'],
+  'action' => [
+    'Apis' => ['edit'],
+    'CoreApi.MatchCallbacks' => ['edit']
+  ]
+];
diff --git a/app/plugins/CoreAssigner/src/Controller/FormatAssignersController.php b/app/plugins/CoreAssigner/src/Controller/FormatAssignersController.php
index 80c1b347e..f1336602e 100644
--- a/app/plugins/CoreAssigner/src/Controller/FormatAssignersController.php
+++ b/app/plugins/CoreAssigner/src/Controller/FormatAssignersController.php
@@ -30,6 +30,7 @@
 namespace CoreAssigner\Controller;
 
 use App\Controller\StandardPluginController;
+use Cake\Event\EventInterface;
 
 class FormatAssignersController extends StandardPluginController {
   protected array $paginate = [
@@ -37,4 +38,25 @@ class FormatAssignersController extends StandardPluginController {
       'FormatAssigners.format' => 'asc'
     ]
   ];
+
+  /**
+   * Callback run prior to the request render.
+   *
+   * @param   EventInterface  $event  Cake Event
+   *
+   * @return Response|void
+   * @since  COmanage Registry v5.0.0
+   */
+
+  public function beforeRender(EventInterface $event) {
+    $link = $this->getPrimaryLink(true);
+
+    if(!empty($link->value)) {
+      $this->set('vv_bc_parent_obj', $this->FormatAssigners->IdentifierAssignments->get($link->value));
+      $this->set('vv_bc_parent_displayfield', $this->FormatAssigners->IdentifierAssignments->getDisplayField());
+      $this->set('vv_bc_parent_primarykey', $this->FormatAssigners->IdentifierAssignments->getPrimaryKey());
+    }
+
+    return parent::beforeRender($event);
+  }
 }
diff --git a/app/plugins/CoreAssigner/src/Controller/SqlAssignersController.php b/app/plugins/CoreAssigner/src/Controller/SqlAssignersController.php
index 1fe0de137..47a5c67e5 100644
--- a/app/plugins/CoreAssigner/src/Controller/SqlAssignersController.php
+++ b/app/plugins/CoreAssigner/src/Controller/SqlAssignersController.php
@@ -30,6 +30,7 @@
 namespace CoreAssigner\Controller;
 
 use App\Controller\StandardPluginController;
+use Cake\Event\EventInterface;
 
 class SqlAssignersController extends StandardPluginController {
   protected array $paginate = [
@@ -37,4 +38,25 @@ class SqlAssignersController extends StandardPluginController {
       'SqlAssigners.server_id' => 'asc'
     ]
   ];
+
+  /**
+   * Callback run prior to the request render.
+   *
+   * @param   EventInterface  $event  Cake Event
+   *
+   * @return Response|void
+   * @since  COmanage Registry v5.0.0
+   */
+
+  public function beforeRender(EventInterface $event) {
+    $link = $this->getPrimaryLink(true);
+
+    if(!empty($link->value)) {
+      $this->set('vv_bc_parent_obj', $this->SqlAssigners->IdentifierAssignments->get($link->value));
+      $this->set('vv_bc_parent_displayfield', $this->SqlAssigners->IdentifierAssignments->getDisplayField());
+      $this->set('vv_bc_parent_primarykey', $this->SqlAssigners->IdentifierAssignments->getPrimaryKey());
+    }
+
+    return parent::beforeRender($event);
+  }
 }
diff --git a/app/plugins/CoreAssigner/templates/FormatAssigners/fields.inc b/app/plugins/CoreAssigner/templates/FormatAssigners/fields.inc
index 2fb2e5bfa..a4d041694 100644
--- a/app/plugins/CoreAssigner/templates/FormatAssigners/fields.inc
+++ b/app/plugins/CoreAssigner/templates/FormatAssigners/fields.inc
@@ -34,6 +34,15 @@ $fields = [
   'maximum',
   'enable_transliteration'
 ];
+
+$subnav = [
+  'tabs' => ['IdentifierAssignments', 'CoreAssigner.FormatAssigners'],
+  'action' => [
+    'IdentifierAssignments' => ['edit'],
+    'CoreAssigner.FormatAssigners' => ['edit']
+  ]
+];
+
 ?>
 
 <script>
diff --git a/app/plugins/CoreAssigner/templates/SqlAssigners/fields.inc b/app/plugins/CoreAssigner/templates/SqlAssigners/fields.inc
index d31414b75..3aec604fa 100644
--- a/app/plugins/CoreAssigner/templates/SqlAssigners/fields.inc
+++ b/app/plugins/CoreAssigner/templates/SqlAssigners/fields.inc
@@ -30,3 +30,11 @@ $fields = [
   'source_table',
   'type_id'
 ];
+
+$subnav = [
+  'tabs' => ['IdentifierAssignments', 'CoreAssigner.SqlAssigners'],
+  'action' => [
+    'IdentifierAssignments' => ['edit'],
+    'CoreAssigner.SqlAssigners' => ['edit']
+  ]
+];
diff --git a/app/plugins/CoreEnroller/src/Model/Table/ApprovalCollectorsTable.php b/app/plugins/CoreEnroller/src/Model/Table/ApprovalCollectorsTable.php
index 29c0bd856..9b0b20a94 100644
--- a/app/plugins/CoreEnroller/src/Model/Table/ApprovalCollectorsTable.php
+++ b/app/plugins/CoreEnroller/src/Model/Table/ApprovalCollectorsTable.php
@@ -47,7 +47,6 @@ class ApprovalCollectorsTable extends Table {
   use \App\Lib\Traits\PermissionsTrait;
   use \App\Lib\Traits\PrimaryLinkTrait;
   use \App\Lib\Traits\TableMetaTrait;
-  use \App\Lib\Traits\TabTrait;
   use \App\Lib\Traits\ValidationTrait;
 
   /**
@@ -82,22 +81,6 @@ public function initialize(array $config): void {
     $this->setPrimaryLink('enrollment_flow_step_id');
     $this->setRequiresCO(true);
     $this->setAllowLookupPrimaryLink(['dispatch', 'display']);
-    
-    // All the tabs share the same configuration in the ModelTable file
-    $this->setTabsConfig(
-      [
-        // Ordered list of Tabs
-        'tabs' => ['EnrollmentFlowSteps', 'CoreEnroller.ApprovalCollectors'],
-        // What actions will include the subnavigation header
-        'action' => [
-          // If a model renders in a subnavigation mode in edit/view mode, it cannot
-          // render in index mode for the same use case/context
-          // XXX edit should go first.
-          'EnrollmentFlowSteps' => ['edit', 'view'],
-          'CoreEnroller.ApprovalCollectors' => ['edit']
-        ]
-      ]
-    );
 
     $this->setAutoViewVars([
       'modes' => [
diff --git a/app/plugins/CoreEnroller/src/Model/Table/AttributeCollectorsTable.php b/app/plugins/CoreEnroller/src/Model/Table/AttributeCollectorsTable.php
index c6f016a1e..2ddc16ebc 100644
--- a/app/plugins/CoreEnroller/src/Model/Table/AttributeCollectorsTable.php
+++ b/app/plugins/CoreEnroller/src/Model/Table/AttributeCollectorsTable.php
@@ -50,7 +50,6 @@ class AttributeCollectorsTable extends Table {
   use \App\Lib\Traits\LayoutTrait;
   use \App\Lib\Traits\PermissionsTrait;
   use \App\Lib\Traits\PrimaryLinkTrait;
-  use \App\Lib\Traits\TabTrait;
   use \App\Lib\Traits\TableMetaTrait;
   use \App\Lib\Traits\ValidationTrait;
 
@@ -83,23 +82,6 @@ public function initialize(array $config): void {
     $this->setRequiresCO(true);
     $this->setAllowLookupPrimaryLink(['dispatch', 'display']);
 
-    // All the tabs share the same configuration in the ModelTable file
-    $this->setTabsConfig(
-      [
-        // Ordered list of Tabs
-        'tabs' => ['EnrollmentFlowSteps', 'CoreEnroller.AttributeCollectors', 'CoreEnroller.EnrollmentAttributes'],
-        // What actions will include the subnavigation header
-        'action' => [
-          // If a model renders in a subnavigation mode in edit/view mode, it cannot
-          // render in index mode for the same use case/context
-          // XXX edit should go first.
-          'EnrollmentFlowSteps' => ['edit', 'view'],
-          'CoreEnroller.AttributeCollectors' => ['edit'],
-          'CoreEnroller.EnrollmentAttributes' => ['index'],
-        ]
-      ]
-    );
-
     $this->setPermissions([
       // Actions that operate over an entity (ie: require an $id)
       'entity' => [
diff --git a/app/plugins/CoreEnroller/src/Model/Table/BasicAttributeCollectorsTable.php b/app/plugins/CoreEnroller/src/Model/Table/BasicAttributeCollectorsTable.php
index 3a1fcd516..99da23e1d 100644
--- a/app/plugins/CoreEnroller/src/Model/Table/BasicAttributeCollectorsTable.php
+++ b/app/plugins/CoreEnroller/src/Model/Table/BasicAttributeCollectorsTable.php
@@ -46,7 +46,6 @@ class BasicAttributeCollectorsTable extends Table {
   use \App\Lib\Traits\LayoutTrait;
   use \App\Lib\Traits\PermissionsTrait;
   use \App\Lib\Traits\PrimaryLinkTrait;
-  use \App\Lib\Traits\TabTrait;
   use \App\Lib\Traits\TableMetaTrait;
   use \App\Lib\Traits\ValidationTrait;
 
@@ -92,22 +91,6 @@ public function initialize(array $config): void {
     $this->setRequiresCO(true);
     $this->setAllowLookupPrimaryLink(['dispatch', 'display']);
 
-    // All the tabs share the same configuration in the ModelTable file
-    $this->setTabsConfig(
-      [
-        // Ordered list of Tabs
-        'tabs' => ['EnrollmentFlowSteps', 'CoreEnroller.BasicAttributeCollectors'],
-        // What actions will include the subnavigation header
-        'action' => [
-          // If a model renders in a subnavigation mode in edit/view mode, it cannot
-          // render in index mode for the same use case/context
-          // XXX edit should go first.
-          'EnrollmentFlowSteps' => ['edit', 'view'],
-          'CoreEnroller.BasicAttributeCollectors' => ['edit'],
-        ]
-      ]
-    );
-
     $this->setAutoViewVars([
       'affiliationTypes' => [
         'type' => 'type',
diff --git a/app/plugins/CoreEnroller/src/Model/Table/EmailVerifiersTable.php b/app/plugins/CoreEnroller/src/Model/Table/EmailVerifiersTable.php
index 2626df8e1..0abcebd69 100644
--- a/app/plugins/CoreEnroller/src/Model/Table/EmailVerifiersTable.php
+++ b/app/plugins/CoreEnroller/src/Model/Table/EmailVerifiersTable.php
@@ -51,7 +51,6 @@ class EmailVerifiersTable extends Table {
   use \App\Lib\Traits\PermissionsTrait;
   use \App\Lib\Traits\PrimaryLinkTrait;
   use \App\Lib\Traits\TableMetaTrait;
-  use \App\Lib\Traits\TabTrait;
   use \App\Lib\Traits\ValidationTrait;
 
   /**
@@ -85,22 +84,6 @@ public function initialize(array $config): void {
     $this->setPrimaryLink('enrollment_flow_step_id');
     $this->setRequiresCO(true);
     $this->setAllowLookupPrimaryLink(['dispatch', 'display', 'resend']);
-    
-    // All the tabs share the same configuration in the ModelTable file
-    $this->setTabsConfig(
-      [
-        // Ordered list of Tabs
-        'tabs' => ['EnrollmentFlowSteps', 'CoreEnroller.EmailVerifiers'],
-        // What actions will include the subnavigation header
-        'action' => [
-          // If a model renders in a subnavigation mode in edit/view mode, it cannot
-          // render in index mode for the same use case/context
-          // XXX edit should go first.
-          'EnrollmentFlowSteps' => ['edit', 'view'],
-          'CoreEnroller.EmailVerifiers' => ['edit']
-        ]
-      ]
-    );
 
     $this->setAutoViewVars([
       'modes' => [
diff --git a/app/plugins/CoreEnroller/src/Model/Table/EnrollmentAttributesTable.php b/app/plugins/CoreEnroller/src/Model/Table/EnrollmentAttributesTable.php
index 97307f214..69fb10619 100644
--- a/app/plugins/CoreEnroller/src/Model/Table/EnrollmentAttributesTable.php
+++ b/app/plugins/CoreEnroller/src/Model/Table/EnrollmentAttributesTable.php
@@ -41,7 +41,6 @@ class EnrollmentAttributesTable extends Table {
   use \App\Lib\Traits\LayoutTrait;
   use \App\Lib\Traits\PermissionsTrait;
   use \App\Lib\Traits\PrimaryLinkTrait;
-  use \App\Lib\Traits\TabTrait;
   use \App\Lib\Traits\TableMetaTrait;
   use \App\Lib\Traits\ValidationTrait;
 
@@ -179,24 +178,6 @@ public function initialize(array $config): void {
                        'view' => 'iframe',
                      ]);
 
-    // All the tabs share the same configuration in the ModelTable file
-    $this->setTabsConfig(
-      [
-        // Ordered list of Tabs
-        'tabs' => ['EnrollmentFlowSteps', 'CoreEnroller.AttributeCollectors', 'CoreEnroller.EnrollmentAttributes'],
-        // What actions will inlcude the subnavigation header
-        'action' => [
-          // If a model renders in a subnavigation mode in edit/view mode, it cannot
-          // render in index mode for the same use case/context
-          // XXX edit should go first.
-          'EnrollmentFlowSteps' => ['edit', 'view'],
-          'CoreEnroller.AttributeCollectors' => ['edit'],
-          'CoreEnroller.EnrollmentAttributes' => ['index'],
-        ],
-        'skipTab' => ['CoreEnroller.AttributeCollectors']
-      ]
-    );
-
     $this->setPermissions([
       // Actions that operate over an entity (ie: require an $id)
       'entity' => [
diff --git a/app/plugins/CoreEnroller/src/Model/Table/IdentifierCollectorsTable.php b/app/plugins/CoreEnroller/src/Model/Table/IdentifierCollectorsTable.php
index fbc2c3335..cf34d2185 100644
--- a/app/plugins/CoreEnroller/src/Model/Table/IdentifierCollectorsTable.php
+++ b/app/plugins/CoreEnroller/src/Model/Table/IdentifierCollectorsTable.php
@@ -44,7 +44,6 @@ class IdentifierCollectorsTable extends Table {
   use \App\Lib\Traits\PermissionsTrait;
   use \App\Lib\Traits\PrimaryLinkTrait;
   use \App\Lib\Traits\TableMetaTrait;
-  use \App\Lib\Traits\TabTrait;
   use \App\Lib\Traits\ValidationTrait;
 
   /**
@@ -78,22 +77,6 @@ public function initialize(array $config): void {
     $this->setRequiresCO(true);
     $this->setAllowLookupPrimaryLink(['dispatch', 'display']);
     
-    // All the tabs share the same configuration in the ModelTable file
-    $this->setTabsConfig(
-      [
-        // Ordered list of Tabs
-        'tabs' => ['EnrollmentFlowSteps', 'CoreEnroller.IdentifierCollectors'],
-        // What actions will include the subnavigation header
-        'action' => [
-          // If a model renders in a subnavigation mode in edit/view mode, it cannot
-          // render in index mode for the same use case/context
-          // XXX edit should go first.
-          'EnrollmentFlowSteps' => ['edit', 'view'],
-          'CoreEnroller.IdentifierCollectors' => ['edit']
-        ]
-      ]
-    );
-    
     $this->setAutoViewVars([
       'types' => [
         'type' => 'type',
diff --git a/app/plugins/CoreEnroller/src/Model/Table/InvitationAcceptersTable.php b/app/plugins/CoreEnroller/src/Model/Table/InvitationAcceptersTable.php
index 21587b228..93f60647e 100644
--- a/app/plugins/CoreEnroller/src/Model/Table/InvitationAcceptersTable.php
+++ b/app/plugins/CoreEnroller/src/Model/Table/InvitationAcceptersTable.php
@@ -45,7 +45,6 @@ class InvitationAcceptersTable extends Table {
   use \App\Lib\Traits\PermissionsTrait;
   use \App\Lib\Traits\PrimaryLinkTrait;
   use \App\Lib\Traits\TableMetaTrait;
-  use \App\Lib\Traits\TabTrait;
   use \App\Lib\Traits\ValidationTrait;
 
   /**
@@ -77,22 +76,6 @@ public function initialize(array $config): void {
     $this->setPrimaryLink('enrollment_flow_step_id');
     $this->setRequiresCO(true);
     $this->setAllowLookupPrimaryLink(['dispatch', 'display']);
-    
-    // All the tabs share the same configuration in the ModelTable file
-    $this->setTabsConfig(
-      [
-        // Ordered list of Tabs
-        'tabs' => ['EnrollmentFlowSteps', 'CoreEnroller.InvitationAccepters'],
-        // What actions will include the subnavigation header
-        'action' => [
-          // If a model renders in a subnavigation mode in edit/view mode, it cannot
-          // render in index mode for the same use case/context
-          // XXX edit should go first.
-          'EnrollmentFlowSteps' => ['edit', 'view'],
-          'CoreEnroller.InvitationAccepters' => ['edit']
-        ]
-      ]
-    );
 
     $this->setPermissions([
       // Actions that operate over an entity (ie: require an $id)
diff --git a/app/plugins/CoreEnroller/templates/ApprovalCollectors/fields.inc b/app/plugins/CoreEnroller/templates/ApprovalCollectors/fields.inc
index d70c14837..c99e19cd8 100644
--- a/app/plugins/CoreEnroller/templates/ApprovalCollectors/fields.inc
+++ b/app/plugins/CoreEnroller/templates/ApprovalCollectors/fields.inc
@@ -30,3 +30,11 @@ $fields = [
   'denial_message_template_id',
   'redirect_on_denial'
 ];
+
+$subnav = [
+  'tabs' => ['EnrollmentFlowSteps', 'CoreEnroller.ApprovalCollectors'],
+  'action' => [
+    'EnrollmentFlowSteps' => ['edit', 'view'],
+    'CoreEnroller.ApprovalCollectors' => ['edit']
+  ],
+];
diff --git a/app/plugins/CoreEnroller/templates/AttributeCollectors/fields.inc b/app/plugins/CoreEnroller/templates/AttributeCollectors/fields.inc
index 9c9f1c2ef..4ec246ca0 100644
--- a/app/plugins/CoreEnroller/templates/AttributeCollectors/fields.inc
+++ b/app/plugins/CoreEnroller/templates/AttributeCollectors/fields.inc
@@ -43,4 +43,13 @@ $topLinks[] = [
     'attribute_collector_id'  => $vv_obj->id
   ],
   'class' => ''
-];
\ No newline at end of file
+];
+
+$subnav = [
+  'tabs' => ['EnrollmentFlowSteps', 'CoreEnroller.AttributeCollectors', 'EnrollmentFlowSteps.Hierarchy'],
+  'action' => [
+    'EnrollmentFlowSteps' => ['edit', 'view'],
+    'CoreEnroller.AttributeCollectors' => ['edit'],
+    'EnrollmentFlowSteps.Hierarchy' => ['index']
+  ],
+];
diff --git a/app/plugins/CoreEnroller/templates/BasicAttributeCollectors/fields.inc b/app/plugins/CoreEnroller/templates/BasicAttributeCollectors/fields.inc
index f1c33e0f7..3a05d030e 100644
--- a/app/plugins/CoreEnroller/templates/BasicAttributeCollectors/fields.inc
+++ b/app/plugins/CoreEnroller/templates/BasicAttributeCollectors/fields.inc
@@ -31,3 +31,11 @@ $fields = [
   'affiliation_type_id',
   'cou_id'
 ];
+
+$subnav = [
+  'tabs' => ['EnrollmentFlowSteps', 'CoreEnroller.BasicAttributeCollectors'],
+  'action' => [
+    'EnrollmentFlowSteps' => ['edit', 'view'],
+    'CoreEnroller.BasicAttributeCollectors' => ['edit']
+  ],
+];
diff --git a/app/plugins/CoreEnroller/templates/EmailVerifiers/fields.inc b/app/plugins/CoreEnroller/templates/EmailVerifiers/fields.inc
index b7d528a2b..f28464a8a 100644
--- a/app/plugins/CoreEnroller/templates/EmailVerifiers/fields.inc
+++ b/app/plugins/CoreEnroller/templates/EmailVerifiers/fields.inc
@@ -117,3 +117,11 @@ $fields = [
     'default' => true
   ]
 ];
+
+$subnav = [
+  'tabs' => ['EnrollmentFlowSteps', 'CoreEnroller.EmailVerifiers'],
+  'action' => [
+    'EnrollmentFlowSteps' => ['edit', 'view'],
+    'CoreEnroller.EmailVerifiers' => ['edit']
+  ],
+];
diff --git a/app/plugins/CoreEnroller/templates/EnrollmentAttributes/columns.inc b/app/plugins/CoreEnroller/templates/EnrollmentAttributes/columns.inc
index a9a955c58..df2fe70a3 100644
--- a/app/plugins/CoreEnroller/templates/EnrollmentAttributes/columns.inc
+++ b/app/plugins/CoreEnroller/templates/EnrollmentAttributes/columns.inc
@@ -56,6 +56,15 @@ $indexColumns = [
   ]
 ];
 
+$subnav = [
+  'tabs' => ['EnrollmentFlowSteps', 'CoreEnroller.AttributeCollectors', 'EnrollmentFlowSteps.Hierarchy'],
+  'action' => [
+    'EnrollmentFlowSteps' => ['edit', 'view'],
+    'CoreEnroller.AttributeCollectors' => ['edit'],
+    'EnrollmentFlowSteps.Hierarchy' => ['index']
+  ],
+];
+
 
 if(empty($attributes)) {
   return;
diff --git a/app/plugins/CoreEnroller/templates/EnrollmentAttributes/fields.inc b/app/plugins/CoreEnroller/templates/EnrollmentAttributes/fields.inc
index 509f48e15..db39b8702 100644
--- a/app/plugins/CoreEnroller/templates/EnrollmentAttributes/fields.inc
+++ b/app/plugins/CoreEnroller/templates/EnrollmentAttributes/fields.inc
@@ -202,3 +202,12 @@ if (
 
   $fields[] = 'hidden';
 }
+
+$subnav = [
+  'tabs' => ['EnrollmentFlowSteps', 'CoreEnroller.AttributeCollectors', 'EnrollmentFlowSteps.Hierarchy'],
+  'action' => [
+    'EnrollmentFlowSteps' => ['edit', 'view'],
+    'CoreEnroller.AttributeCollectors' => ['edit'],
+    'EnrollmentFlowSteps.Hierarchy' => ['index']
+  ],
+];
diff --git a/app/plugins/CoreEnroller/templates/IdentifierCollectors/fields.inc b/app/plugins/CoreEnroller/templates/IdentifierCollectors/fields.inc
index f719a2fd7..183a8a858 100644
--- a/app/plugins/CoreEnroller/templates/IdentifierCollectors/fields.inc
+++ b/app/plugins/CoreEnroller/templates/IdentifierCollectors/fields.inc
@@ -28,3 +28,11 @@
 $fields = [
   'type_id'
 ];
+
+$subnav = [
+  'tabs' => ['EnrollmentFlowSteps', 'CoreEnroller.IdentifierCollectors'],
+  'action' => [
+    'EnrollmentFlowSteps' => ['edit', 'view'],
+    'CoreEnroller.IdentifierCollectors' => ['edit']
+  ],
+];
diff --git a/app/plugins/CoreEnroller/templates/InvitationAccepters/fields.inc b/app/plugins/CoreEnroller/templates/InvitationAccepters/fields.inc
index 61ee21bbb..8a317ee61 100644
--- a/app/plugins/CoreEnroller/templates/InvitationAccepters/fields.inc
+++ b/app/plugins/CoreEnroller/templates/InvitationAccepters/fields.inc
@@ -31,3 +31,11 @@ $fields = [
   ],
   'welcome_message'
 ];
+
+$subnav = [
+  'tabs' => ['EnrollmentFlowSteps', 'CoreEnroller.InvitationAccepters'],
+  'action' => [
+    'EnrollmentFlowSteps' => ['edit', 'view'],
+    'CoreEnroller.InvitationAccepters' => ['edit']
+  ],
+];
diff --git a/app/plugins/CoreServer/src/Controller/HttpServersController.php b/app/plugins/CoreServer/src/Controller/HttpServersController.php
index 61fd0cf51..be6405551 100644
--- a/app/plugins/CoreServer/src/Controller/HttpServersController.php
+++ b/app/plugins/CoreServer/src/Controller/HttpServersController.php
@@ -30,6 +30,7 @@
 namespace CoreServer\Controller;
 
 use App\Controller\StandardPluginController;
+use Cake\Event\EventInterface;
 
 class HttpServersController extends StandardPluginController {
   protected array $paginate = [
@@ -37,4 +38,25 @@ class HttpServersController extends StandardPluginController {
       'HttpServers.url' => 'asc'
     ]
   ];
+
+  /**
+   * Callback run prior to the request render.
+   *
+   * @param   EventInterface  $event  Cake Event
+   *
+   * @return Response|void
+   * @since  COmanage Registry v5.0.0
+   */
+
+  public function beforeRender(EventInterface $event) {
+    $link = $this->getPrimaryLink(true);
+
+    if(!empty($link->value)) {
+      $this->set('vv_bc_parent_obj', $this->HttpServers->Servers->get($link->value));
+      $this->set('vv_bc_parent_displayfield', $this->HttpServers->Servers->getDisplayField());
+      $this->set('vv_bc_parent_primarykey', $this->HttpServers->Servers->getPrimaryKey());
+    }
+
+    return parent::beforeRender($event);
+  }
 }
diff --git a/app/plugins/CoreServer/src/Controller/MatchServerAttributesController.php b/app/plugins/CoreServer/src/Controller/MatchServerAttributesController.php
index 3060bb4af..cd770d8db 100644
--- a/app/plugins/CoreServer/src/Controller/MatchServerAttributesController.php
+++ b/app/plugins/CoreServer/src/Controller/MatchServerAttributesController.php
@@ -52,6 +52,14 @@ class MatchServerAttributesController extends StandardPluginController {
 
   public function beforeRender(\Cake\Event\EventInterface $event)
   {
+    $link = $this->getPrimaryLink(true);
+
+    if(!empty($link->value)) {
+      $this->set('vv_bc_parent_obj', $this->MatchServerAttributes->MatchServers->get($link->value));
+      $this->set('vv_bc_parent_displayfield', $this->MatchServerAttributes->MatchServers->getDisplayField());
+      $this->set('vv_bc_parent_primarykey', $this->MatchServerAttributes->MatchServers->getPrimaryKey());
+    }
+    
     // Build standard server breadcrumbs from *_server_id
     $customParents = $this->buildServerParamBreadcrumbs();
 
diff --git a/app/plugins/CoreServer/src/Controller/MatchServersController.php b/app/plugins/CoreServer/src/Controller/MatchServersController.php
index 26d3ea59e..be2e29638 100644
--- a/app/plugins/CoreServer/src/Controller/MatchServersController.php
+++ b/app/plugins/CoreServer/src/Controller/MatchServersController.php
@@ -30,6 +30,7 @@
 namespace CoreServer\Controller;
 
 use App\Controller\StandardPluginController;
+use Cake\Event\EventInterface;
 
 class MatchServersController extends StandardPluginController {
   protected array $paginate = [
@@ -37,4 +38,25 @@ class MatchServersController extends StandardPluginController {
       'MatchServers.url' => 'asc'
     ]
   ];
+
+  /**
+   * Callback run prior to the request render.
+   *
+   * @param   EventInterface  $event  Cake Event
+   *
+   * @return Response|void
+   * @since  COmanage Registry v5.0.0
+   */
+
+  public function beforeRender(EventInterface $event) {
+    $link = $this->getPrimaryLink(true);
+
+    if(!empty($link->value)) {
+      $this->set('vv_bc_parent_obj', $this->MatchServers->Servers->get($link->value));
+      $this->set('vv_bc_parent_displayfield', $this->MatchServers->Servers->getDisplayField());
+      $this->set('vv_bc_parent_primarykey', $this->MatchServers->Servers->getPrimaryKey());
+    }
+
+    return parent::beforeRender($event);
+  }
 }
diff --git a/app/plugins/CoreServer/src/Controller/Oauth2ServersController.php b/app/plugins/CoreServer/src/Controller/Oauth2ServersController.php
index 6dc2e08f1..40c2cbfcb 100644
--- a/app/plugins/CoreServer/src/Controller/Oauth2ServersController.php
+++ b/app/plugins/CoreServer/src/Controller/Oauth2ServersController.php
@@ -50,10 +50,16 @@ class Oauth2ServersController extends StandardPluginController
    * @since  COmanage Registry v5.2.0
    */
 
-  public function beforeRender(EventInterface $event)
-  {
-    // Generate the Redirect URI
+  public function beforeRender(EventInterface $event) {
+    $link = $this->getPrimaryLink(true);
 
+    if(!empty($link->value)) {
+      $this->set('vv_bc_parent_obj', $this->Oauth2Servers->Servers->get($link->value));
+      $this->set('vv_bc_parent_displayfield', $this->Oauth2Servers->Servers->getDisplayField());
+      $this->set('vv_bc_parent_primarykey', $this->Oauth2Servers->Servers->getPrimaryKey());
+    }
+    
+    // Generate the Redirect URI
     if ($this->getRequest()->getParam('action') === 'edit') {
       $id = $this->getRequest()->getParam('pass')[0] ?? null; // Assuming $id comes from passed arguments
       $this->set('vv_redirect_uri', $this->Oauth2Servers->redirectUri($id));
diff --git a/app/plugins/CoreServer/src/Controller/SmtpServersController.php b/app/plugins/CoreServer/src/Controller/SmtpServersController.php
index 710076bb8..bca8b47ab 100644
--- a/app/plugins/CoreServer/src/Controller/SmtpServersController.php
+++ b/app/plugins/CoreServer/src/Controller/SmtpServersController.php
@@ -30,6 +30,7 @@
 namespace CoreServer\Controller;
 
 use App\Controller\StandardPluginController;
+use Cake\Event\EventInterface;
 
 class SmtpServersController extends StandardPluginController {
   protected array $paginate = [
@@ -37,4 +38,25 @@ class SmtpServersController extends StandardPluginController {
       'SmtpServers.hostname' => 'asc'
     ]
   ];
+
+  /**
+   * Callback run prior to the request render.
+   *
+   * @param   EventInterface  $event  Cake Event
+   *
+   * @return Response|void
+   * @since  COmanage Registry v5.0.0
+   */
+
+  public function beforeRender(EventInterface $event) {
+    $link = $this->getPrimaryLink(true);
+
+    if(!empty($link->value)) {
+      $this->set('vv_bc_parent_obj', $this->SmtpServers->Servers->get($link->value));
+      $this->set('vv_bc_parent_displayfield', $this->SmtpServers->Servers->getDisplayField());
+      $this->set('vv_bc_parent_primarykey', $this->SmtpServers->Servers->getPrimaryKey());
+    }
+
+    return parent::beforeRender($event);
+  }
 }
diff --git a/app/plugins/CoreServer/src/Controller/SqlServersController.php b/app/plugins/CoreServer/src/Controller/SqlServersController.php
index e595dd510..9e840242f 100644
--- a/app/plugins/CoreServer/src/Controller/SqlServersController.php
+++ b/app/plugins/CoreServer/src/Controller/SqlServersController.php
@@ -30,6 +30,7 @@
 namespace CoreServer\Controller;
 
 use App\Controller\StandardPluginController;
+use Cake\Event\EventInterface;
 
 class SqlServersController extends StandardPluginController {
   protected array $paginate = [
@@ -37,4 +38,25 @@ class SqlServersController extends StandardPluginController {
       'SqlServers.hostname' => 'asc'
     ]
   ];
+
+  /**
+   * Callback run prior to the request render.
+   *
+   * @param   EventInterface  $event  Cake Event
+   *
+   * @return Response|void
+   * @since  COmanage Registry v5.0.0
+   */
+
+  public function beforeRender(EventInterface $event) {
+    $link = $this->getPrimaryLink(true);
+
+    if(!empty($link->value)) {
+      $this->set('vv_bc_parent_obj', $this->SqlServers->Servers->get($link->value));
+      $this->set('vv_bc_parent_displayfield', $this->SqlServers->Servers->getDisplayField());
+      $this->set('vv_bc_parent_primarykey', $this->SqlServers->Servers->getPrimaryKey());
+    }
+
+    return parent::beforeRender($event);
+  }
 }
diff --git a/app/plugins/CoreServer/templates/HttpServers/fields.inc b/app/plugins/CoreServer/templates/HttpServers/fields.inc
index f242894ec..6926478fc 100644
--- a/app/plugins/CoreServer/templates/HttpServers/fields.inc
+++ b/app/plugins/CoreServer/templates/HttpServers/fields.inc
@@ -32,3 +32,11 @@ $fields = [
   'auth_type',
   'skip_ssl_verification'
 ];
+
+$subnav = [
+  'tabs' => ['Servers', 'CoreServer.HttpServers'],
+  'action' => [
+    'Servers' => ['edit'],
+    'CoreServer.HttpServers' => ['edit']
+  ]
+];
diff --git a/app/plugins/CoreServer/templates/MatchServerAttributes/columns.inc b/app/plugins/CoreServer/templates/MatchServerAttributes/columns.inc
index 588605a76..2e2d71ad4 100644
--- a/app/plugins/CoreServer/templates/MatchServerAttributes/columns.inc
+++ b/app/plugins/CoreServer/templates/MatchServerAttributes/columns.inc
@@ -41,3 +41,12 @@ $indexColumns = [
     'class' => 'RequiredEnum'
   ]
 ];
+
+$subnav = [
+  'tabs' => ['Servers', 'CoreServer.MatchServers', 'CoreServer.MatchServerAttributes'],
+  'action' => [
+    'Servers' => ['edit'],
+    'CoreServer.MatchServers' => ['edit'],
+    'CoreServer.MatchServerAttributes' => ['index']
+  ]
+];
diff --git a/app/plugins/CoreServer/templates/MatchServerAttributes/fields.inc b/app/plugins/CoreServer/templates/MatchServerAttributes/fields.inc
index bbef08ca1..d674bc5e8 100644
--- a/app/plugins/CoreServer/templates/MatchServerAttributes/fields.inc
+++ b/app/plugins/CoreServer/templates/MatchServerAttributes/fields.inc
@@ -46,6 +46,15 @@ foreach ([
 }
 
 $fields[] = 'required';
+
+$subnav = [
+  'tabs' => ['Servers', 'CoreServer.MatchServers', 'CoreServer.MatchServerAttributes'],
+  'action' => [
+    'Servers' => ['edit'],
+    'CoreServer.MatchServers' => ['edit'],
+    'CoreServer.MatchServerAttributes' => ['index']
+  ]
+];
 ?>
 
 <script>
diff --git a/app/plugins/CoreServer/templates/MatchServers/fields.inc b/app/plugins/CoreServer/templates/MatchServers/fields.inc
index 19d1b85e1..8fb6ac14c 100644
--- a/app/plugins/CoreServer/templates/MatchServers/fields.inc
+++ b/app/plugins/CoreServer/templates/MatchServers/fields.inc
@@ -45,3 +45,12 @@ if(!empty($vv_obj->url)) {
     'class' => ''
   ];
 }
+
+$subnav = [
+  'tabs' => ['Servers', 'CoreServer.MatchServers', 'CoreServer.MatchServerAttributes'],
+  'action' => [
+    'Servers' => ['edit'],
+    'CoreServer.MatchServers' => ['edit'],
+    'CoreServer.MatchServerAttributes' => ['index']
+  ]
+];
diff --git a/app/plugins/CoreServer/templates/Oauth2Servers/fields.inc b/app/plugins/CoreServer/templates/Oauth2Servers/fields.inc
index 31680066e..aa342d45b 100644
--- a/app/plugins/CoreServer/templates/Oauth2Servers/fields.inc
+++ b/app/plugins/CoreServer/templates/Oauth2Servers/fields.inc
@@ -62,4 +62,13 @@ $fields['access_token'] = [
   'status' => !empty($vv_obj->access_token) ? __d('enumeration', 'SetBooleanEnum.1') : __d('enumeration', 'SetBooleanEnum.0'),
   'link' => $generateLink,
   'labelIsTextOnly' => true
-];
\ No newline at end of file
+];
+
+$subnav = [
+  'tabs' => ['Servers', 'CoreServer.Oauth2Servers'],
+  'action' => [
+    'Servers' => ['edit'],
+    'CoreServer.Oauth2Servers' => ['edit']
+  ]
+];
+  
\ No newline at end of file
diff --git a/app/plugins/CoreServer/templates/SmtpServers/fields.inc b/app/plugins/CoreServer/templates/SmtpServers/fields.inc
index 5cd2706f0..882000297 100644
--- a/app/plugins/CoreServer/templates/SmtpServers/fields.inc
+++ b/app/plugins/CoreServer/templates/SmtpServers/fields.inc
@@ -40,3 +40,11 @@ $fields = [
   'override_to'
 ];
 
+$subnav = [
+  'tabs' => ['Servers', 'CoreServer.SmtpServers'],
+  'action' => [
+    'Servers' => ['edit'],
+    'CoreServer.SmtpServers' => ['edit']
+  ]
+];
+  
\ No newline at end of file
diff --git a/app/plugins/CoreServer/templates/SqlServers/fields.inc b/app/plugins/CoreServer/templates/SqlServers/fields.inc
index 0108053c0..7b9482170 100644
--- a/app/plugins/CoreServer/templates/SqlServers/fields.inc
+++ b/app/plugins/CoreServer/templates/SqlServers/fields.inc
@@ -33,3 +33,11 @@ $fields = [
   'username',
   'password'
 ];
+
+$subnav = [
+  'tabs' => ['Servers', 'CoreServer.SqlServers'],
+  'action' => [
+    'Servers' => ['edit'],
+    'CoreServer.SqlServers' => ['edit']
+  ]
+];
diff --git a/app/plugins/EnvSource/src/Model/Table/EnvSourceCollectorsTable.php b/app/plugins/EnvSource/src/Model/Table/EnvSourceCollectorsTable.php
index af57c539e..ecdfce194 100644
--- a/app/plugins/EnvSource/src/Model/Table/EnvSourceCollectorsTable.php
+++ b/app/plugins/EnvSource/src/Model/Table/EnvSourceCollectorsTable.php
@@ -48,7 +48,6 @@ class EnvSourceCollectorsTable extends Table {
   use \App\Lib\Traits\PrimaryLinkTrait;
   use \App\Lib\Traits\TableMetaTrait;
   use \App\Lib\Traits\ValidationTrait;
-  use \App\Lib\Traits\TabTrait;
 
   /**
    * Perform Cake Model initialization.
@@ -81,22 +80,6 @@ public function initialize(array $config): void {
     $this->setRequiresCO(true);
     $this->setAllowLookupPrimaryLink(['dispatch', 'display']);
 
-    // All the tabs share the same configuration in the ModelTable file
-    $this->setTabsConfig(
-      [
-        // Ordered list of Tabs
-        'tabs' => ['EnrollmentFlowSteps', 'EnvSource.EnvSourceCollectors'],
-        // What actions will include the subnavigation header
-        'action' => [
-          // If a model renders in a subnavigation mode in edit/view mode, it cannot
-          // render in index mode for the same use case/context
-          // XXX edit should go first.
-          'EnrollmentFlowSteps' => ['edit', 'view'],
-          'EnvSource.EnvSourceCollectors' => ['edit'],
-        ]
-      ]
-    );
-
     $this->setAutoViewVars([
       'externalIdentitySources' => [
         'type' => 'plugin',
diff --git a/app/plugins/EnvSource/src/Model/Table/EnvSourcesTable.php b/app/plugins/EnvSource/src/Model/Table/EnvSourcesTable.php
index 398a231eb..d915c46c1 100644
--- a/app/plugins/EnvSource/src/Model/Table/EnvSourcesTable.php
+++ b/app/plugins/EnvSource/src/Model/Table/EnvSourcesTable.php
@@ -41,7 +41,6 @@ class EnvSourcesTable extends Table {
   use \App\Lib\Traits\PermissionsTrait;
   use \App\Lib\Traits\PrimaryLinkTrait;
   use \App\Lib\Traits\QueryModificationTrait;
-  use \App\Lib\Traits\TabTrait;
   use \App\Lib\Traits\TableMetaTrait;
   use \App\Lib\Traits\ValidationTrait;
 
@@ -106,23 +105,6 @@ public function initialize(array $config): void {
       'ExternalIdentitySources',
     ]);
 
-    // All the tabs share the same configuration in the ModelTable file
-    $this->setTabsConfig(
-      [
-        // Ordered list of Tabs
-        'tabs' => ['ExternalIdentitySources', 'EnvSource.EnvSources', 'ExternalIdentitySources@action.search'],
-        // What actions will include the subnavigation header
-        'action' => [
-          // If a model renders in a subnavigation mode in edit/view mode, it cannot
-          // render in index mode for the same use case/context
-          // XXX edit should go first.
-          'ExternalIdentitySources' => ['edit', 'view', 'search'],
-          'EnvSource.EnvSources' => ['edit'],
-          'ExternalIdentitySources@action.search' => [],
-        ],
-      ]
-    );
-
     $this->setAutoViewVars([
       'addressTypes' => [
         'type' => 'type',
diff --git a/app/plugins/EnvSource/templates/EnvSourceCollectors/fields.inc b/app/plugins/EnvSource/templates/EnvSourceCollectors/fields.inc
index a6d5ae141..de96bfcb2 100644
--- a/app/plugins/EnvSource/templates/EnvSourceCollectors/fields.inc
+++ b/app/plugins/EnvSource/templates/EnvSourceCollectors/fields.inc
@@ -30,3 +30,11 @@ $fields = [
     'fieldLabel' => __d('env_source', 'controller.EnvSources', [1])
   ]
 ];
+
+$subnav = [
+  'tabs' => ['EnrollmentFlowSteps', 'EnvSource.EnvSourceCollectors'],
+  'action' => [
+    'EnrollmentFlowSteps' => ['edit', 'view'],
+    'EnvSource.EnvSourceCollectors' => ['edit']
+  ],
+];
diff --git a/app/plugins/EnvSource/templates/EnvSources/fields.inc b/app/plugins/EnvSource/templates/EnvSources/fields.inc
index 9918d1fec..4d6d9479e 100644
--- a/app/plugins/EnvSource/templates/EnvSources/fields.inc
+++ b/app/plugins/EnvSource/templates/EnvSources/fields.inc
@@ -73,3 +73,12 @@ foreach($defaultNames as $field => $envName) {
     'default' => $envName
   ];
 }
+
+$subnav = [
+  'tabs' => ['ExternalIdentitySources', 'EnvSource.EnvSources', 'ExternalIdentitySources@action.search'],
+  'action' => [
+    'ExternalIdentitySources' => ['edit', 'view', 'search'],
+    'EnvSource.EnvSources' => ['edit'],
+    'ExternalIdentitySources@action.search' => [],
+  ],
+];
diff --git a/app/plugins/OrcidSource/src/Model/Table/OrcidSourceCollectorsTable.php b/app/plugins/OrcidSource/src/Model/Table/OrcidSourceCollectorsTable.php
index 5f1efacbd..809a89471 100644
--- a/app/plugins/OrcidSource/src/Model/Table/OrcidSourceCollectorsTable.php
+++ b/app/plugins/OrcidSource/src/Model/Table/OrcidSourceCollectorsTable.php
@@ -44,7 +44,6 @@ class OrcidSourceCollectorsTable extends Table {
     use \App\Lib\Traits\PrimaryLinkTrait;
     use \App\Lib\Traits\TableMetaTrait;
     use \App\Lib\Traits\ValidationTrait;
-    use \App\Lib\Traits\TabTrait;
 
     /**
      * Perform Cake Model initialization.
@@ -73,22 +72,6 @@ public function initialize(array $config): void {
         $this->setRequiresCO(true);
         $this->setAllowLookupPrimaryLink(['dispatch', 'display']);
 
-        // All the tabs share the same configuration in the ModelTable file
-        $this->setTabsConfig(
-            [
-                // Ordered list of Tabs
-                'tabs' => ['EnrollmentFlowSteps', 'OrcidSource.OrcidSourceCollectors'],
-                // What actions will include the subnavigation header
-                'action' => [
-                    // If a model renders in a subnavigation mode in edit/view mode, it cannot
-                    // render in index mode for the same use case/context
-                    // XXX edit should go first.
-                    'EnrollmentFlowSteps' => ['edit', 'view'],
-                    'OrcidSource.OrcidSourceCollectors' => ['edit'],
-                ]
-            ]
-        );
-
         $this->setAutoViewVars([
             'externalIdentitySources' => [
                 'type' => 'plugin',
diff --git a/app/plugins/OrcidSource/src/Model/Table/OrcidSourcesTable.php b/app/plugins/OrcidSource/src/Model/Table/OrcidSourcesTable.php
index 23ac151ae..60745cddd 100644
--- a/app/plugins/OrcidSource/src/Model/Table/OrcidSourcesTable.php
+++ b/app/plugins/OrcidSource/src/Model/Table/OrcidSourcesTable.php
@@ -47,7 +47,6 @@ class OrcidSourcesTable extends Table {
     use \App\Lib\Traits\PermissionsTrait;
     use \App\Lib\Traits\PrimaryLinkTrait;
     use \App\Lib\Traits\QueryModificationTrait;
-    use \App\Lib\Traits\TabTrait;
     use \App\Lib\Traits\TableMetaTrait;
     use \App\Lib\Traits\ValidationTrait;
 
@@ -111,23 +110,6 @@ public function initialize(array $config): void {
         $this->setPrimaryLink(['external_identity_source_id']);
         $this->setRequiresCO(true);
 
-        // All the tabs share the same configuration in the ModelTable file
-        $this->setTabsConfig(
-            [
-                // Ordered list of Tabs
-                'tabs' => ['ExternalIdentitySources', 'OrcidSource.OrcidSources', 'ExternalIdentitySources@action.search'],
-                // What actions will include the subnavigation header
-                'action' => [
-                    // If a model renders in a subnavigation mode in edit/view mode, it cannot
-                    // render in index mode for the same use case/context
-                    // XXX edit should go first.
-                    'ExternalIdentitySources' => ['edit', 'view', 'search'],
-                    'OrcidSource.OrcidSources' => ['edit'],
-                    'ExternalIdentitySources@action.search' => [],
-                ],
-            ]
-        );
-
         $this->setEditContains([
             'Servers' => ['Oauth2Servers'],
             'ExternalIdentitySources',
diff --git a/app/plugins/OrcidSource/templates/OrcidSourceCollectors/fields.inc b/app/plugins/OrcidSource/templates/OrcidSourceCollectors/fields.inc
index 1bd5230e4..b7f871854 100644
--- a/app/plugins/OrcidSource/templates/OrcidSourceCollectors/fields.inc
+++ b/app/plugins/OrcidSource/templates/OrcidSourceCollectors/fields.inc
@@ -30,3 +30,11 @@ $fields = [
     'fieldLabel' => __d('orcid_source', 'controller.OrcidSources', [1])
   ]
 ];
+
+$subnav = [
+  'tabs' => ['EnrollmentFlowSteps', 'OrcidSource.OrcidSourceCollectors'],
+  'action' => [
+    'EnrollmentFlowSteps' => ['edit', 'view'],
+    'OrcidSource.OrcidSourceCollectors' => ['edit']
+  ],
+];
diff --git a/app/plugins/OrcidSource/templates/OrcidSources/fields.inc b/app/plugins/OrcidSource/templates/OrcidSources/fields.inc
index 5af0d8b6e..f1ff2572e 100644
--- a/app/plugins/OrcidSource/templates/OrcidSources/fields.inc
+++ b/app/plugins/OrcidSource/templates/OrcidSources/fields.inc
@@ -67,3 +67,12 @@ $fields = [
   'email_address_type_id',
   'name_type_id'
 ];
+
+$subnav = [
+  'tabs' => ['ExternalIdentitySources', 'OrcidSource.OrcidSources', 'ExternalIdentitySources@action.search'],
+  'action' => [
+    'ExternalIdentitySources' => ['edit', 'view', 'search'],
+    'OrcidSource.OrcidSources' => ['edit'],
+    'ExternalIdentitySources@action.search' => [],
+  ],
+];
diff --git a/app/plugins/SshKeyAuthenticator/src/Controller/SshKeyAuthenticatorsController.php b/app/plugins/SshKeyAuthenticator/src/Controller/SshKeyAuthenticatorsController.php
index b3f8babf0..3e9b89401 100644
--- a/app/plugins/SshKeyAuthenticator/src/Controller/SshKeyAuthenticatorsController.php
+++ b/app/plugins/SshKeyAuthenticator/src/Controller/SshKeyAuthenticatorsController.php
@@ -30,6 +30,7 @@
 namespace SshKeyAuthenticator\Controller;
 
 use App\Controller\StandardPluginController;
+use Cake\Event\EventInterface;
 
 class SshKeyAuthenticatorsController extends StandardPluginController {
   protected array $paginate = [
@@ -37,4 +38,27 @@ class SshKeyAuthenticatorsController extends StandardPluginController {
       'SshKeyAuthenticators.id' => 'asc'
     ]
   ];
+
+
+  /**
+   * Callback run prior to the request render.
+   *
+   * @param   EventInterface  $event  Cake Event
+   *
+   * @return Response|void
+   * @since  COmanage Registry v5.0.0
+   */
+
+  public function beforeRender(EventInterface $event) {
+    $link = $this->getPrimaryLink(true);
+
+    if(!empty($link->value)) {
+      $this->set('vv_bc_parent_obj', $this->SshKeyAuthenticators->Authenticators->get($link->value));
+      $this->set('vv_bc_parent_displayfield', $this->SshKeyAuthenticators->Authenticators->getDisplayField());
+      $this->set('vv_bc_parent_primarykey', $this->SshKeyAuthenticators->Authenticators->getPrimaryKey());
+    }
+
+    return parent::beforeRender($event);
+  }
+
 }
diff --git a/app/plugins/SshKeyAuthenticator/templates/SshKeyAuthenticators/fields.inc b/app/plugins/SshKeyAuthenticator/templates/SshKeyAuthenticators/fields.inc
index 8ab1f70bc..e22c09e37 100644
--- a/app/plugins/SshKeyAuthenticator/templates/SshKeyAuthenticators/fields.inc
+++ b/app/plugins/SshKeyAuthenticator/templates/SshKeyAuthenticators/fields.inc
@@ -29,6 +29,14 @@ declare(strict_types = 1);
 
 $this->Field->disableFormEditMode();
 
+$subnav = [
+  'tabs' => ['Authenticators', 'SshKeyAuthenticator.SshKeyAuthenticators'],
+  'action' => [
+    'Authenticators' => ['edit'],
+    'SshKeyAuthenticator.SshKeyAuthenticators' => ['edit']
+  ]
+];
+
 // There are currently no configurable options for the SSH Key Authenticator
 $alerts = [
   [
diff --git a/app/plugins/TermsAgreer/src/Model/Table/AgreementCollectorsTable.php b/app/plugins/TermsAgreer/src/Model/Table/AgreementCollectorsTable.php
index 6fae56858..41dc1699b 100644
--- a/app/plugins/TermsAgreer/src/Model/Table/AgreementCollectorsTable.php
+++ b/app/plugins/TermsAgreer/src/Model/Table/AgreementCollectorsTable.php
@@ -45,7 +45,6 @@ class AgreementCollectorsTable extends Table {
   use \App\Lib\Traits\PermissionsTrait;
   use \App\Lib\Traits\PrimaryLinkTrait;
   use \App\Lib\Traits\TableMetaTrait;
-  use \App\Lib\Traits\TabTrait;
   use \App\Lib\Traits\ValidationTrait;
 
   /**
@@ -77,22 +76,6 @@ public function initialize(array $config): void {
     $this->setRequiresCO(true);
     $this->setAllowLookupPrimaryLink(['dispatch', 'display']);
     
-    // All the tabs share the same configuration in the ModelTable file
-    $this->setTabsConfig(
-      [
-        // Ordered list of Tabs
-        'tabs' => ['EnrollmentFlowSteps', 'TermsAgreer.AgreementCollectors'],
-        // What actions will include the subnavigation header
-        'action' => [
-          // If a model renders in a subnavigation mode in edit/view mode, it cannot
-          // render in index mode for the same use case/context
-          // XXX edit should go first.
-          'EnrollmentFlowSteps' => ['edit', 'view'],
-          'TermsAgreer.AgreementCollectors' => ['edit']
-        ]
-      ]
-    );
-
     $this->setAutoViewVars([
       'tAndCModes' => [
         'type' => 'enum',
diff --git a/app/plugins/TermsAgreer/templates/AgreementCollectors/fields.inc b/app/plugins/TermsAgreer/templates/AgreementCollectors/fields.inc
index 0501b90ca..ae160b7cb 100644
--- a/app/plugins/TermsAgreer/templates/AgreementCollectors/fields.inc
+++ b/app/plugins/TermsAgreer/templates/AgreementCollectors/fields.inc
@@ -28,3 +28,11 @@
 $fields = [
   't_and_c_mode'
 ];
+
+$subnav = [
+  'tabs' => ['EnrollmentFlowSteps', 'TermsAgreer.AgreementCollectors'],
+  'action' => [
+    'EnrollmentFlowSteps' => ['edit', 'view'],
+    'TermsAgreer.AgreementCollectors' => ['edit']
+  ],
+];
diff --git a/app/resources/locales/en_US/operation.po b/app/resources/locales/en_US/operation.po
index 810994840..f1c2a522e 100644
--- a/app/resources/locales/en_US/operation.po
+++ b/app/resources/locales/en_US/operation.po
@@ -336,6 +336,9 @@ msgstr "Save"
 msgid "search"
 msgstr "Search"
 
+msgid "search.a"
+msgstr "Search {0}"
+
 msgid "search.global"
 msgstr "Global Search"
 
diff --git a/app/src/Lib/Traits/TabTrait.php b/app/src/Lib/Traits/TabTrait.php
deleted file mode 100644
index 66f029f25..000000000
--- a/app/src/Lib/Traits/TabTrait.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * COmanage Registry Tab Trait
- *
- * 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)
- */
-
-declare(strict_types = 1);
-
-namespace App\Lib\Traits;
-
-trait TabTrait
-{
-  /**
-   * Tabs configuration
-   *
-   * @var array
-   * @since  COmanage Registry v5.0.0
- */
-  private array $tabsConfig = [];
-
-  /**
-   * Get the configuration for tabs based on the specified action.
-   *
-   * @param   string  $action  The action for which the tab configuration is requested.
-   *
-   * @return array The tab configuration for the specified action, or the entire tab configuration
-   *                if the action is not specified or invalid.
-   * @since  COmanage Registry v5.0.0
- */
-  public function getTabsConfig(string $action): array
-  {
-    if(!empty($action) && !empty($this->tabsConfig[$action])) {
-      return $this->tabsConfig[$action];
-    }
-
-    return $this->tabsConfig;
-  }
-
-  /**
-   * @param   array  $tabsConfig
-   *
-   * @return void
-   * @since  COmanage Registry v5.0.0
- */
-  public function setTabsConfig(array $tabsConfig): void
-  {
-    $this->tabsConfig = $tabsConfig;
-  }
-
-}
\ No newline at end of file
diff --git a/app/src/Lib/Util/StringUtilities.php b/app/src/Lib/Util/StringUtilities.php
index 1f24cf1ca..0dd4a06ce 100644
--- a/app/src/Lib/Util/StringUtilities.php
+++ b/app/src/Lib/Util/StringUtilities.php
@@ -350,7 +350,7 @@ public static function entityAndActionToTitle($entity,
     // Title: translate with override key first; if not found, fall back to default key.
     // Super/Sub titles: set to the display (needed for External IDs in UI).
     if (
-      $entity->id !== null &&
+      $entity?->id !== null &&
       $action !== 'add' &&
       $action !== 'delete' &&
       $display !== null
diff --git a/app/src/Model/Table/EnrollmentFlowStepsTable.php b/app/src/Model/Table/EnrollmentFlowStepsTable.php
index 8fce44cc8..aa6df8af4 100644
--- a/app/src/Model/Table/EnrollmentFlowStepsTable.php
+++ b/app/src/Model/Table/EnrollmentFlowStepsTable.php
@@ -45,7 +45,6 @@ class EnrollmentFlowStepsTable extends Table {
   use \App\Lib\Traits\PermissionsTrait;
   use \App\Lib\Traits\PluggableModelTrait;
   use \App\Lib\Traits\PrimaryLinkTrait;
-  use \App\Lib\Traits\TabTrait;
   use \App\Lib\Traits\TableMetaTrait;
   use \App\Lib\Traits\ValidationTrait;
 
@@ -145,43 +144,6 @@ public function initialize(array $config): void {
         ]
       ]
     ]);
-
-    $this->setTabsConfig(
-      [
-        'index' => [
-          // Ordered list of Tabs
-          'tabs' => ['EnrollmentFlows', 'EnrollmentFlowSteps', 'Petitions'],
-          // What actions will inlcude the subnavigation header
-          'action' => [
-            // If a model renders in a subnavigation mode in edit/view mode, it cannot
-            // render in index mode for the same use case/context
-            // XXX edit should go first.
-            'EnrollmentFlows' => ['edit', 'view'],
-            'EnrollmentFlowSteps' => ['index'],
-            'Petitions' => ['index'],
-          ],
-          // What model will have a counter-badge after the tab title
-          'counter' => ['EnrollmentFlowSteps', 'Petitions']
-        ],
-        'edit' => [
-          // Ordered list of Tabs
-          'tabs' => ['EnrollmentFlowSteps', 'EnrollmentFlowSteps.Plugin', 'EnrollmentFlowSteps.Hierarchy'],
-          // What actions will inlcude the subnavigation header
-          'action' => [
-            // If a model renders in a subnavigation mode in edit/view mode, it cannot
-            // render in index mode for the same use case/context
-            // XXX edit should go first.
-            'EnrollmentFlowSteps' => ['edit', 'view'],
-            'EnrollmentFlowSteps.Plugin' => ['edit'],
-            // This means that we are looking at the plugins associated model
-            // EnrollmentFlowSteps -> plugin -> @plugin
-            // XXX There might be plugins that have no hasMany associations. We will check
-            //     for these use cases inside the element.
-            'EnrollmentFlowSteps.Hierarchy' => ['index']
-          ],
-        ]
-      ]
-    );
   }
   
   /**
diff --git a/app/src/Model/Table/EnrollmentFlowsTable.php b/app/src/Model/Table/EnrollmentFlowsTable.php
index 6ccbc1f92..e8c0fe8c3 100644
--- a/app/src/Model/Table/EnrollmentFlowsTable.php
+++ b/app/src/Model/Table/EnrollmentFlowsTable.php
@@ -49,7 +49,6 @@ class EnrollmentFlowsTable extends Table {
   use \App\Lib\Traits\PermissionsTrait;
   use \App\Lib\Traits\PrimaryLinkTrait;
   use \App\Lib\Traits\SearchFilterTrait;
-  use \App\Lib\Traits\TabTrait;
   use \App\Lib\Traits\TableMetaTrait;
   use \App\Lib\Traits\ValidationTrait;
 
@@ -151,24 +150,6 @@ public function initialize(array $config): void {
         ]
       ]
     ]);
-
-    $this->setTabsConfig(
-      [
-        // Ordered list of Tabs
-        'tabs' => ['EnrollmentFlows', 'EnrollmentFlowSteps', 'Petitions'],
-        // What actions will inlcude the subnavigation header
-        'action' => [
-          // If a model renders in a subnavigation mode in edit/view mode, it cannot
-          // render in index mode for the same use case/context
-          // XXX edit should go first.
-          'EnrollmentFlows' => ['edit', 'view'],
-          'EnrollmentFlowSteps' => ['index'],
-          'Petitions' => ['index'],
-        ],
-        // What model will have a counter-badge after the tab title
-        'counter' => ['EnrollmentFlowSteps', 'Petitions']
-      ]
-    );
   }
 
   /**
diff --git a/app/src/Model/Table/ExtIdentitySourceRecordsTable.php b/app/src/Model/Table/ExtIdentitySourceRecordsTable.php
index 4d2a7601c..757e0a50f 100644
--- a/app/src/Model/Table/ExtIdentitySourceRecordsTable.php
+++ b/app/src/Model/Table/ExtIdentitySourceRecordsTable.php
@@ -50,7 +50,6 @@ class ExtIdentitySourceRecordsTable extends Table {
   use \App\Lib\Traits\SearchFilterTrait;
   use \App\Lib\Traits\TableMetaTrait;
   use \App\Lib\Traits\ValidationTrait;
-  use \App\Lib\Traits\TabTrait;
 
   /**
    * Perform Cake Model initialization.
@@ -107,38 +106,6 @@ public function initialize(array $config): void {
       ]
     ]);*/
 
-    $this->setTabsConfig(
-      [
-        // Ordered list of Tabs
-        'tabs' => ['People', 'PersonRoles', 'ExternalIdentities'],
-        // What actions will include the subnavigation header
-        'action' => [
-          // If a model renders in a subnavigation mode in edit/view mode, it cannot
-          // render in index mode for the same use case/context
-          // XXX edit should go first.
-          'People' => ['edit', 'view'],
-          'PersonRoles' => ['index'],
-          'ExternalIdentities' => ['index'],
-        ],
-        // What model will have a counter-badge after the tab title
-        'counter' => ['PersonRoles', 'ExternalIdentities'],
-        'nested' => [
-          // Ordered list of Tabs
-          'tabs' => ['ExternalIdentities', 'ExternalIdentityRoles'],
-          // What actions will include the subnavigation header
-          'action' => [
-            // If a model renders in a subnavigation mode in edit/view mode, it cannot
-            // render in index mode for the same use case/context
-            // XXX edit should go first.
-            'ExternalIdentities' => ['edit', 'view'],
-            'ExternalIdentityRoles' => ['index'],
-          ],
-          // What model will have a counter-badge after the tab title
-          'counter' => ['ExternalIdentityRoles'],
-        ]
-      ]
-    );
-
     $this->setPermissions([
       // Actions that operate over an entity (ie: require an $id)
       'entity' => [
diff --git a/app/src/Model/Table/ExternalIdentitiesTable.php b/app/src/Model/Table/ExternalIdentitiesTable.php
index e91e00926..5c4996ba7 100644
--- a/app/src/Model/Table/ExternalIdentitiesTable.php
+++ b/app/src/Model/Table/ExternalIdentitiesTable.php
@@ -49,7 +49,6 @@ class ExternalIdentitiesTable extends Table {
   use \App\Lib\Traits\TableMetaTrait;
   use \App\Lib\Traits\ValidationTrait;
   use \App\Lib\Traits\SearchFilterTrait;
-  use \App\Lib\Traits\TabTrait;
 
   /**
    * Perform Cake Model initialization.
@@ -152,39 +151,6 @@ public function initialize(array $config): void {
       ]
     ]);
 
-    // All the tabs share the same configuration in the ModelTable file
-    $this->setTabsConfig(
-      [
-        // Ordered list of Tabs
-        'tabs' => ['People', 'PersonRoles', 'ExternalIdentities'],
-        // What actions will include the subnavigation header
-        'action' => [
-          // If a model renders in a subnavigation mode in edit/view mode, it cannot
-          // render in index mode for the same use case/context
-          // XXX edit should go first.
-          'People' => ['edit', 'view'],
-          'PersonRoles' => ['index'],
-          'ExternalIdentities' => ['index'],
-        ],
-        // What model will have a counter-badge after the tab title
-        'counter' => ['PersonRoles', 'ExternalIdentities'],
-        'nested' => [
-          // Ordered list of Tabs
-          'tabs' => ['ExternalIdentities', 'ExternalIdentityRoles'],
-          // What actions will include the subnavigation header
-          'action' => [
-            // If a model renders in a subnavigation mode in edit/view mode, it cannot
-            // render in index mode for the same use case/context
-            // XXX edit should go first.
-            'ExternalIdentities' => ['edit', 'view'],
-            'ExternalIdentityRoles' => ['index']
-          ],
-          // What model will have a counter-badge after the tab title
-          'counter' => ['ExternalIdentityRoles'],
-        ]
-      ]
-    );
-
     $this->setPermissions([
       // Actions that operate over an entity (ie: require an $id)
 // See also CFM-126
diff --git a/app/src/Model/Table/ExternalIdentityRolesTable.php b/app/src/Model/Table/ExternalIdentityRolesTable.php
index 541e465c5..145184627 100644
--- a/app/src/Model/Table/ExternalIdentityRolesTable.php
+++ b/app/src/Model/Table/ExternalIdentityRolesTable.php
@@ -47,7 +47,6 @@ class ExternalIdentityRolesTable extends Table {
   use \App\Lib\Traits\PrimaryLinkTrait;
   use \App\Lib\Traits\QueryModificationTrait;
   use \App\Lib\Traits\SearchFilterTrait;
-  use \App\Lib\Traits\TabTrait;
   use \App\Lib\Traits\TableMetaTrait;
   use \App\Lib\Traits\ValidationTrait;
 
@@ -120,38 +119,6 @@ public function initialize(array $config): void {
       ]
     ]);
 
-    $this->setTabsConfig(
-      [
-        // Ordered list of Tabs
-        'tabs' => ['People', 'PersonRoles', 'ExternalIdentities'],
-        // What actions will include the subnavigation header
-        'action' => [
-          // If a model renders in a subnavigation mode in edit/view mode, it cannot
-          // render in index mode for the same use case/context
-          // XXX edit should go first.
-          'People' => ['edit', 'view'],
-          'PersonRoles' => ['index'],
-          'ExternalIdentities' => ['index'],
-        ],
-        // What model will have a counter-badge after the tab title
-        'counter' => ['PersonRoles', 'ExternalIdentities'],
-        'nested' => [
-          // Ordered list of Tabs
-          'tabs' => ['ExternalIdentities', 'ExternalIdentityRoles'],
-          // What actions will include the subnavigation header
-          'action' => [
-            // If a model renders in a subnavigation mode in edit/view mode, it cannot
-            // render in index mode for the same use case/context
-            // XXX edit should go first.
-            'ExternalIdentities' => ['edit', 'view'],
-            'ExternalIdentityRoles' => ['edit', 'view', 'index'],
-          ],
-          // What model will have a counter-badge after the tab title
-          'counter' => ['ExternalIdentityRoles'],
-        ]
-      ]
-    );
-
     $this->setPermissions([
       // Actions that operate over an entity (ie: require an $id)
 // See also CFM-126
diff --git a/app/src/Model/Table/ExternalIdentitySourcesTable.php b/app/src/Model/Table/ExternalIdentitySourcesTable.php
index 42837ecf3..4ef8ddde9 100644
--- a/app/src/Model/Table/ExternalIdentitySourcesTable.php
+++ b/app/src/Model/Table/ExternalIdentitySourcesTable.php
@@ -49,7 +49,6 @@ class ExternalIdentitySourcesTable extends Table {
   use \App\Lib\Traits\PrimaryLinkTrait;
   use \App\Lib\Traits\TableMetaTrait;
   use \App\Lib\Traits\ValidationTrait;
-  use \App\Lib\Traits\TabTrait;
 
   // Cache of the EIS configuration, keyed on id
   protected $eisCache = null;
@@ -103,23 +102,6 @@ public function initialize(array $config): void {
       ]
     ]);
 
-    // All the tabs share the same configuration in the ModelTable file
-    $this->setTabsConfig(
-      [
-        // Ordered-list of Tabs
-        'tabs' => ['ExternalIdentitySources', 'ExternalIdentitySources.Plugin', 'ExternalIdentitySources@action.search'],
-        // What actions will include the subnavigation header
-        'action' => [
-          // If a model renders in a subnavigation mode in edit/view mode, it cannot
-          // render in index mode for the same use case/context
-          // XXX edit should go first.
-          'ExternalIdentitySources' => ['edit', 'view', 'search'],
-          'ExternalIdentitySources.Plugin' => ['edit'],
-          'ExternalIdentitySources@action.search' => [],
-        ],
-      ]
-    );
-
     $this->setPermissions([
       // Actions that operate over an entity (ie: require an $id)
       'entity' => [
diff --git a/app/src/Model/Table/GroupMembersTable.php b/app/src/Model/Table/GroupMembersTable.php
index b93b08967..120b7e2fd 100644
--- a/app/src/Model/Table/GroupMembersTable.php
+++ b/app/src/Model/Table/GroupMembersTable.php
@@ -52,7 +52,6 @@ class GroupMembersTable extends Table {
   use \App\Lib\Traits\ProvisionableTrait;
   use \App\Lib\Traits\QueryModificationTrait;
   use \App\Lib\Traits\SearchFilterTrait;
-  use \App\Lib\Traits\TabTrait;
   use \App\Lib\Traits\TableMetaTrait;
   use \App\Lib\Traits\ValidationTrait;
   use \App\Lib\Traits\SearchFilterTrait;
@@ -134,32 +133,20 @@ public function initialize(array $config): void {
       ]
     ]);
 
-      $this->setFilterConfig([
-         'family' => [
-             'type' => 'string',
-             'model' => 'People.Names',
-             'active' => true,
-             'order' => 2
-         ],
-         'given' => [
-             'type' => 'string',
-             'model' => 'People.Names',
-             'active' => true,
-             'order' => 1
-         ],
-     ]);
-
-    $this->setTabsConfig(
-      [
-        'tabs' => ['Groups', 'GroupMembers', 'GroupNestings'],
-        'action' => [
-          'Groups' => ['edit', 'view'],
-          'GroupMembers' => ['index'],
-          'GroupNestings' => ['index'],
-        ],
-        'counter' => ['GroupMembers']
-      ]
-    );
+    $this->setFilterConfig([
+       'family' => [
+           'type' => 'string',
+           'model' => 'People.Names',
+           'active' => true,
+           'order' => 2
+       ],
+       'given' => [
+           'type' => 'string',
+           'model' => 'People.Names',
+           'active' => true,
+           'order' => 1
+       ],
+   ]);
   }
   
   /**
diff --git a/app/src/Model/Table/GroupNestingsTable.php b/app/src/Model/Table/GroupNestingsTable.php
index eca7373d5..17a4f2ca4 100644
--- a/app/src/Model/Table/GroupNestingsTable.php
+++ b/app/src/Model/Table/GroupNestingsTable.php
@@ -43,7 +43,6 @@ class GroupNestingsTable extends Table {
   use \App\Lib\Traits\PermissionsTrait;
   use \App\Lib\Traits\PrimaryLinkTrait;
   use \App\Lib\Traits\QueryModificationTrait;
-  use \App\Lib\Traits\TabTrait;
   use \App\Lib\Traits\TableMetaTrait;
   use \App\Lib\Traits\ValidationTrait;
 
@@ -113,18 +112,6 @@ public function initialize(array $config): void {
       ]
     ]);
 
-    $this->setTabsConfig(
-      [
-        'tabs' => ['Groups', 'GroupMembers', 'GroupNestings'],
-        'action' => [
-          'Groups' => ['edit', 'view'],
-          'GroupMembers' => ['index'],
-          'GroupNestings' => ['index'],
-        ],
-        'counter' => ['GroupMembers']
-      ]
-    );
-
     // XXX Keeping for functionality reference
 //    $this->setAutoViewVars([
 //     'groupMembers' => [
diff --git a/app/src/Model/Table/GroupsTable.php b/app/src/Model/Table/GroupsTable.php
index 9452f3e05..cd3174351 100644
--- a/app/src/Model/Table/GroupsTable.php
+++ b/app/src/Model/Table/GroupsTable.php
@@ -55,7 +55,6 @@ class GroupsTable extends Table {
   use \App\Lib\Traits\ProvisionableTrait;
   use \App\Lib\Traits\QueryModificationTrait;
   use \App\Lib\Traits\SearchFilterTrait;
-  use \App\Lib\Traits\TabTrait;
   use \App\Lib\Traits\TableMetaTrait;
   use \App\Lib\Traits\TreeTrait {
     potentialParents as traitPotentialParents;
@@ -206,24 +205,6 @@ public function initialize(array $config): void {
       ]
     ]);
 
-    $this->setTabsConfig(
-      [
-        // Ordered list of Tabs
-        'tabs' => ['Groups', 'GroupMembers', 'GroupNestings'],
-        // What actions will inlcude the subnavigation header
-        'action' => [
-          // If a model renders in a subnavigation mode in edit/view mode, it cannot
-          // render in index mode for the same use case/context
-          // XXX edit should go first.
-          'Groups' => ['edit', 'view'],
-          'GroupMembers' => ['index'],
-          'GroupNestings' => ['index'],
-        ],
-        // What model will have a counter-badge after the tab title
-        'counter' => ['GroupMembers']
-      ]
-    );
-
     $this->setPermissions([
   // XXX update for couAdmins, etc
       // Actions that operate over an entity (ie: require an $id)
diff --git a/app/src/Model/Table/PeopleTable.php b/app/src/Model/Table/PeopleTable.php
index c4d76b1c4..82fa658c6 100644
--- a/app/src/Model/Table/PeopleTable.php
+++ b/app/src/Model/Table/PeopleTable.php
@@ -56,7 +56,6 @@ class PeopleTable extends Table {
   use \App\Lib\Traits\ProvisionableTrait;
   use \App\Lib\Traits\QueryModificationTrait;
   use \App\Lib\Traits\SearchFilterTrait;
-  use \App\Lib\Traits\TabTrait;
   use \App\Lib\Traits\TableMetaTrait;
   use \App\Lib\Traits\ValidationTrait;
 
@@ -261,24 +260,6 @@ public function initialize(array $config): void {
       ],
     ]);
 
-    $this->setTabsConfig(
-      [
-        // Ordered list of Tabs
-        'tabs' => ['People', 'PersonRoles', 'ExternalIdentities'],
-        // What actions will inlcude the subnavigation header
-        'action' => [
-          // If a model renders in a subnavigation mode in edit/view mode, it cannot
-          // render in index mode for the same use case/context
-          // XXX edit should go first.
-          'People' => ['edit', 'view'],
-          'PersonRoles' => ['index'],
-          'ExternalIdentities' => ['index'],
-        ],
-        // What model will have a counter-badge after the tab title
-        'counter' => ['PersonRoles', 'ExternalIdentities']
-      ]
-    );
-
     $this->setPermissions([
       // Actions that operate over an entity (ie: require an $id)
 // See also CFM-126
diff --git a/app/src/Model/Table/PersonRolesTable.php b/app/src/Model/Table/PersonRolesTable.php
index 41791badd..3a9bb3a14 100644
--- a/app/src/Model/Table/PersonRolesTable.php
+++ b/app/src/Model/Table/PersonRolesTable.php
@@ -54,7 +54,6 @@ class PersonRolesTable extends Table {
   use \App\Lib\Traits\TypeTrait;
   use \App\Lib\Traits\ValidationTrait;
   use \App\Lib\Traits\SearchFilterTrait;
-  use \App\Lib\Traits\TabTrait;
 
   // Default "out of the box" types for this model. Entries here should be
   // given a default localization in app/resources/locales/*/defaultType.po
@@ -176,24 +175,6 @@ public function initialize(array $config): void {
       ]
     ]);
 
-    $this->setTabsConfig(
-      [
-        // Ordered list of Tabs
-        'tabs' => ['People', 'PersonRoles', 'ExternalIdentities'],
-        // What actions will inlcude the subnavigation header
-        'action' => [
-          // If a model renders in a subnavigation mode in edit/view mode, it cannot
-          // render in index mode for the same use case/context
-          // XXX edit should go first.
-          'People' => ['edit', 'view'],
-          'PersonRoles' => ['edit', 'view', 'index'],
-          'ExternalIdentities' => ['index'],
-        ],
-        // What model will have a counter-badge after the tab title
-        'counter' => ['PersonRoles', 'ExternalIdentities']
-      ]
-    );
-
     $this->setPermissions([
       // Actions that operate over an entity (ie: require an $id)
 // See also CFM-126
diff --git a/app/src/Model/Table/PetitionsTable.php b/app/src/Model/Table/PetitionsTable.php
index 520b9f73a..99975d000 100644
--- a/app/src/Model/Table/PetitionsTable.php
+++ b/app/src/Model/Table/PetitionsTable.php
@@ -54,7 +54,6 @@ class PetitionsTable extends Table {
   use \App\Lib\Traits\PrimaryLinkTrait;
   use \App\Lib\Traits\QueryModificationTrait;
   use \App\Lib\Traits\SearchFilterTrait;
-  use \App\Lib\Traits\TabTrait;
   use \App\Lib\Traits\TableMetaTrait;
   use \App\Lib\Traits\ValidationTrait;
   use \App\Lib\Traits\SearchFilterTrait;
@@ -240,24 +239,6 @@ public function initialize(array $config): void {
 
       return null;
     });
-
-    $this->setTabsConfig(
-      [
-        // Ordered list of Tabs
-        'tabs' => ['EnrollmentFlows', 'EnrollmentFlowSteps', 'Petitions'],
-        // What actions will include the subnavigation header
-        'action' => [
-          // If a model renders in a subnavigation mode in edit/view mode, it cannot
-          // render in index mode for the same use case/context
-          // XXX edit should go first.
-          'EnrollmentFlows' => ['edit', 'view'],
-          'EnrollmentFlowSteps' => ['index'],
-          'Petitions' => ['index'],
-        ],
-        // What model will have a counter-badge after the tab title
-        'counter' => ['EnrollmentFlowSteps', 'Petitions']
-      ]
-    );
   }
 
   /**
diff --git a/app/src/View/Helper/TabHelper.php b/app/src/View/Helper/TabHelper.php
index 0f040dbf5..9ba4d85de 100644
--- a/app/src/View/Helper/TabHelper.php
+++ b/app/src/View/Helper/TabHelper.php
@@ -179,7 +179,7 @@ public function getDeepNestedId(array $linkFilter): ?int
    * @return string
    * @since  COmanage Registry v5.0.0
    */
-  public function getLinkClass(string $tab, bool $isNested = false): string
+  public function getLinkClass(string $tab, bool $isNested = false, array $nestings = []): string
   {
     $vv_sub_nav_attributes = $this->getView()->get('vv_sub_nav_attributes');
 
@@ -201,7 +201,10 @@ public function getLinkClass(string $tab, bool $isNested = false): string
       // The fullModelName can either be a simple Model or a Plugin with the path.
       $tab === $fullModelName && \in_array($curAction, ['index', 'edit', 'view']),
       // Always mark active the parent Tab
-      !$isNested && $parentModelForNested !== null && $tab === $parentModelForNested,
+      !$isNested && $parentModelForNested !== null && $tab === $parentModelForNested && in_array($fullModelName, $nestings),
+      // Match Configuration and Hierarchy tabs
+      isset($plugin) && str_contains($tab, '.Plugin') && $curAction === 'edit',
+      isset($plugin) && str_contains($tab, '.Hierarchy') && $curAction === 'index',
       // Matches the action tab links, e.g. FileSource/search
       $tab === "{$curController}@action.{$curAction}" => 'nav-link active',
       default => 'nav-link'
diff --git a/app/templates/AdHocAttributes/columns.inc b/app/templates/AdHocAttributes/columns.inc
index 6d621a76c..4fee411ec 100644
--- a/app/templates/AdHocAttributes/columns.inc
+++ b/app/templates/AdHocAttributes/columns.inc
@@ -33,17 +33,3 @@ $indexColumns = [
     'type' => 'echo'
   ]
 ];
-
-/*
-// When the $bulkActions variable exists in a columns.inc config, the "Bulk edit" switch will appear in the index. 
-$bulkActions = [
-  // TODO: develop bulk actions. For now, use a placeholder.
-  'delete' => true
-];
-*/
-
-$subnav = [
-  'name' => 'person',
-  'active' => 'person',
-  'subActive' => 'ad_hoc_attributes'
-];
\ No newline at end of file
diff --git a/app/templates/Addresses/columns.inc b/app/templates/Addresses/columns.inc
index 886c92bb7..21eee18bf 100644
--- a/app/templates/Addresses/columns.inc
+++ b/app/templates/Addresses/columns.inc
@@ -37,17 +37,3 @@ $indexColumns = [
     'class' => 'LanguageEnum'
   ]
 ];
-
-/*
-// When the $bulkActions variable exists in a columns.inc config, the "Bulk edit" switch will appear in the index. 
-$bulkActions = [
-  // TODO: develop bulk actions. For now, use a placeholder.
-  'delete' => true
-];
-*/
-
-$subnav = [
-  'name' => 'person',
-  'active' => 'person',
-  'subActive' => 'addresses'
-];
diff --git a/app/templates/ApiUsers/columns.inc b/app/templates/ApiUsers/columns.inc
index 65313d1de..c28ea5c35 100644
--- a/app/templates/ApiUsers/columns.inc
+++ b/app/templates/ApiUsers/columns.inc
@@ -59,11 +59,3 @@ if($vv_cur_co->id > 1) {
 $indexColumns['valid_through'] = [
   'type' => 'datetime'
 ];
-
-/*
-// When the $bulkActions variable exists in a columns.inc config, the "Bulk edit" switch will appear in the index. 
-$bulkActions = [
-  // TODO: develop bulk actions. For now, use a placeholder.
-  'delete' => true
-];
-*/
\ No newline at end of file
diff --git a/app/templates/Apis/columns.inc b/app/templates/Apis/columns.inc
index 2909122e0..8c2579209 100644
--- a/app/templates/Apis/columns.inc
+++ b/app/templates/Apis/columns.inc
@@ -53,11 +53,3 @@ $rowActions = [
     'icon'    => 'electrical_services'
   ]
 ];
-
-/*
-// When the $bulkActions variable exists in a columns.inc config, the "Bulk edit" switch will appear in the index. 
-$bulkActions = [
-  // TODO: develop bulk actions. For now, use a placeholder.
-  'delete' => true
-];
-*/
\ No newline at end of file
diff --git a/app/templates/Apis/fields.inc b/app/templates/Apis/fields.inc
index 69553b5d7..ae85063dc 100644
--- a/app/templates/Apis/fields.inc
+++ b/app/templates/Apis/fields.inc
@@ -32,4 +32,6 @@ $fields = [
     'labelIsTextOnly' => true
   ],
   'api_user_id'
-];
\ No newline at end of file
+];
+
+$subnav = 'standard';
diff --git a/app/templates/Authenticators/columns.inc b/app/templates/Authenticators/columns.inc
index c26e059d0..d17efb0eb 100644
--- a/app/templates/Authenticators/columns.inc
+++ b/app/templates/Authenticators/columns.inc
@@ -50,10 +50,4 @@ $rowActions = [
   ]
 ];
 
-/*
-// When the $bulkActions variable exists in a columns.inc config, the "Bulk edit" switch will appear in the index. 
-$bulkActions = [
-  // TODO: develop bulk actions. For now, use a placeholder.
-  'delete' => true
-];
-*/
\ No newline at end of file
+$subnav = 'standard';
diff --git a/app/templates/Authenticators/fields.inc b/app/templates/Authenticators/fields.inc
index af527df08..bd92a6631 100644
--- a/app/templates/Authenticators/fields.inc
+++ b/app/templates/Authenticators/fields.inc
@@ -33,3 +33,5 @@ $fields = [
   ],
   'message_template_id'
 ];
+
+$subnav = 'standard';
diff --git a/app/templates/Cos/columns.inc b/app/templates/Cos/columns.inc
index d7b28ee06..0f09ca87b 100644
--- a/app/templates/Cos/columns.inc
+++ b/app/templates/Cos/columns.inc
@@ -57,11 +57,3 @@ $rowActions = [
     'icon'   => 'content_copy'
   ]
 ];
-
-/*
-// When the $bulkActions variable exists in a columns.inc config, the "Bulk edit" switch will appear in the index. 
-$bulkActions = [
-  // TODO: develop bulk actions. For now, use a placeholder.
-  'delete' => true
-];
-*/
diff --git a/app/templates/Cous/columns.inc b/app/templates/Cous/columns.inc
index 08ff8d7eb..72f9f5fd3 100644
--- a/app/templates/Cous/columns.inc
+++ b/app/templates/Cous/columns.inc
@@ -37,11 +37,3 @@ $indexColumns = [
     'type' => 'echo'
   ]
 ];
-
-/*
-// When the $bulkActions variable exists in a columns.inc config, the "Bulk edit" switch will appear in the index. 
-$bulkActions = [
-  // TODO: develop bulk actions. For now, use a placeholder.
-  'delete' => true
-];
-*/
\ No newline at end of file
diff --git a/app/templates/EmailAddresses/columns.inc b/app/templates/EmailAddresses/columns.inc
index 050dbc717..93ca3b009 100644
--- a/app/templates/EmailAddresses/columns.inc
+++ b/app/templates/EmailAddresses/columns.inc
@@ -33,17 +33,3 @@ $indexColumns = [
     'type' => 'fk'
   ]
 ];
-
-/*
-// When the $bulkActions variable exists in a columns.inc config, the "Bulk edit" switch will appear in the index. 
-$bulkActions = [
-  // TODO: develop bulk actions. For now, use a placeholder.
-  'delete' => true
-];
-*/
-
-$subnav = [
-  'name' => 'person',
-  'active' => 'person',
-  'subActive' => 'email_addresses'
-];
\ No newline at end of file
diff --git a/app/templates/EnrollmentFlowSteps/columns.inc b/app/templates/EnrollmentFlowSteps/columns.inc
index 4ed3e0dfc..31831cdf9 100644
--- a/app/templates/EnrollmentFlowSteps/columns.inc
+++ b/app/templates/EnrollmentFlowSteps/columns.inc
@@ -53,12 +53,5 @@ $indexColumns = [
   ]
 ];
 
-// $rowActions appear as row-level menu items in the index view gear icon
-// XXX Turn this off, but leave for reference (for now): configure is a tab in the modal dialog  
-//$rowActions = [
-//  [
-//    'action'  => 'configure',
-//    'label'   => __d('operation', 'configure.plugin'),
-//    'icon'    => 'electrical_services'
-//  ]
-//];
+$subnav = 'petitions';
+
diff --git a/app/templates/EnrollmentFlowSteps/fields.inc b/app/templates/EnrollmentFlowSteps/fields.inc
index 3651eba96..bdf534f91 100644
--- a/app/templates/EnrollmentFlowSteps/fields.inc
+++ b/app/templates/EnrollmentFlowSteps/fields.inc
@@ -39,6 +39,9 @@ $fields = [
   'notification_group_id',
   'notification_message_template_id'
 ];
+
+$subnav = 'steps';
+
 ?>
 
 <script>
diff --git a/app/templates/EnrollmentFlows/fields.inc b/app/templates/EnrollmentFlows/fields.inc
index c6aa4ef76..a9e856830 100644
--- a/app/templates/EnrollmentFlows/fields.inc
+++ b/app/templates/EnrollmentFlows/fields.inc
@@ -42,6 +42,8 @@ $fields = [
   'notification_message_template_id'
 ];
 
+$subnav = 'petitions';
+
 ?>
 
 <script>
diff --git a/app/templates/ExtIdentitySourceRecords/fields.inc b/app/templates/ExtIdentitySourceRecords/fields.inc
index c220f5b62..590f549f0 100644
--- a/app/templates/ExtIdentitySourceRecords/fields.inc
+++ b/app/templates/ExtIdentitySourceRecords/fields.inc
@@ -127,16 +127,4 @@ if(!empty($vv_obj->external_identity_id)) {
       ]
     ]
   ];
-
-  // primary name: $vv_obj->external_identity->person->primary_name->full_name
-  $subnav = [
-    'name' => 'person',
-    'active' => 'external_identities',
-    'subActive' => 'external_identity_roles',
-    'tabsId' => $vv_obj->external_identity->person->id,
-    'tabsController' => 'people',
-    'subTabsId' => $vv_obj->external_identity->id,
-    'subTabsController' => 'external_identities',
-    'tabsSupertitle' =>  $vv_obj->external_identity->description
-  ];
 }
diff --git a/app/templates/ExternalIdentities/columns.inc b/app/templates/ExternalIdentities/columns.inc
index 0283f8f16..cbf0ebad3 100644
--- a/app/templates/ExternalIdentities/columns.inc
+++ b/app/templates/ExternalIdentities/columns.inc
@@ -38,17 +38,6 @@ $indexColumns = [
   ]
 ];
 
-/*
-// When the $bulkActions variable exists in a columns.inc config, the "Bulk edit" switch will appear in the index. 
-$bulkActions = [
-  // TODO: develop bulk actions. For now, use a placeholder.
-  'delete' => true
-];
-*/
-
-$subnav = [
-  'name' => 'person',
-  'active' => 'external_identities'
-];
+$subnav = 'people';
   
-$suppressAddLink = true;
\ No newline at end of file
+$suppressAddLink = true;
diff --git a/app/templates/ExternalIdentities/fields.inc b/app/templates/ExternalIdentities/fields.inc
index 36e679059..d72a344cb 100644
--- a/app/templates/ExternalIdentities/fields.inc
+++ b/app/templates/ExternalIdentities/fields.inc
@@ -56,6 +56,8 @@ $fields = [
   'date_of_birth' // date
 ];
 
+$subnav = 'people';
+
 // List the MVEAs that may be shown on the mveaCanvas
 // When this array exists, the mveaCanvas.php element will render  
 $mveas = [
@@ -189,9 +191,3 @@ $addMenuLinks = [
     'icon' => 'link'
   ]
 ];
-
-$subnav = [
-  'name' => 'person',
-  'active' => 'external_identities',
-  'subActive' => 'properties'
-];
diff --git a/app/templates/ExternalIdentityRoles/columns.inc b/app/templates/ExternalIdentityRoles/columns.inc
index a925abfbe..3d2781b50 100644
--- a/app/templates/ExternalIdentityRoles/columns.inc
+++ b/app/templates/ExternalIdentityRoles/columns.inc
@@ -45,16 +45,4 @@ $indexColumns = [
   ]
 ];
 
-$subnav = [
-  'name' => 'person',
-  'active' => 'external_identities',
-  'subActive' => 'external_identity_roles'
-];
-
-/*
-// When the $bulkActions variable exists in a columns.inc config, the "Bulk edit" switch will appear in the index. 
-$bulkActions = [
-  // TODO: develop bulk actions. For now, use a placeholder.
-  'delete' => true
-];
-*/
\ No newline at end of file
+$subnav = 'people';
diff --git a/app/templates/ExternalIdentityRoles/fields.inc b/app/templates/ExternalIdentityRoles/fields.inc
index a88858a19..5a896db02 100644
--- a/app/templates/ExternalIdentityRoles/fields.inc
+++ b/app/templates/ExternalIdentityRoles/fields.inc
@@ -80,8 +80,4 @@ $addMenuLinks = [
   ]
 ];
 
-$subnav = [
-  'name' => 'person',
-  'active' => 'external_identities',
-  'subActive' => 'external_identity_roles'
-];
\ No newline at end of file
+$subnav = 'people';
diff --git a/app/templates/ExternalIdentitySources/columns.inc b/app/templates/ExternalIdentitySources/columns.inc
index 7fb3cc7f8..e22c7698d 100644
--- a/app/templates/ExternalIdentitySources/columns.inc
+++ b/app/templates/ExternalIdentitySources/columns.inc
@@ -65,11 +65,3 @@ $rowActions = [
     'icon'    => 'electrical_services'
   ]
 ];
-
-/*
-// When the $bulkActions variable exists in a columns.inc config, the "Bulk edit" switch will appear in the index. 
-$bulkActions = [
-  // TODO: develop bulk actions. For now, use a placeholder.
-  'delete' => true
-];
-*/
\ No newline at end of file
diff --git a/app/templates/ExternalIdentitySources/fields.inc b/app/templates/ExternalIdentitySources/fields.inc
index 6d2d0a041..605ab025f 100644
--- a/app/templates/ExternalIdentitySources/fields.inc
+++ b/app/templates/ExternalIdentitySources/fields.inc
@@ -37,7 +37,9 @@ $fields = [
   'suppress_noop_logs'
 ];
 
-$fields = array_merge($fields, include(ROOT . DS . 'templates' . DS . 'Standard/metadata.inc'));      
+$fields = array_merge($fields, include(ROOT . DS . 'templates' . DS . 'Standard/metadata.inc'));
+
+$subnav = 'eis';
       
 // Top Links
 $topLinks = [
diff --git a/app/templates/ExternalIdentitySources/search.php b/app/templates/ExternalIdentitySources/search.php
index 4c3674b2e..79858177c 100644
--- a/app/templates/ExternalIdentitySources/search.php
+++ b/app/templates/ExternalIdentitySources/search.php
@@ -29,6 +29,11 @@
 
 // Required by the subnavigation partial
 $modelsName = $this->getName();
+$fullModelsName = !empty($this->getPlugin()) ? $this->getPlugin() . '.' . $modelsName : $modelsName;
+$modelsTable = $this->Tab->getModelTableReference($fullModelsName);
+
+$subnav = 'eis';
+
 // Subnavigation calculations
 if(file_exists(ROOT . DS . 'templates' . DS . 'Standard/subnavigation.inc')) {
   include(ROOT . DS . 'templates' . DS . 'Standard/subnavigation.inc');
diff --git a/app/templates/Flanges/columns.inc b/app/templates/Flanges/columns.inc
index e5b405913..85e235f55 100644
--- a/app/templates/Flanges/columns.inc
+++ b/app/templates/Flanges/columns.inc
@@ -53,11 +53,3 @@ $rowActions = [
     'icon'    => 'electrical_services'
   ]
 ];
-
-/*
-// When the $bulkActions variable exists in a columns.inc config, the "Bulk edit" switch will appear in the index. 
-$bulkActions = [
-  // TODO: develop bulk actions. For now, use a placeholder.
-  'delete' => true
-];
-*/
\ No newline at end of file
diff --git a/app/templates/GroupMembers/columns.inc b/app/templates/GroupMembers/columns.inc
index 92c07e715..110f7c341 100644
--- a/app/templates/GroupMembers/columns.inc
+++ b/app/templates/GroupMembers/columns.inc
@@ -27,88 +27,134 @@
 
 use App\Lib\Enum\BulkActionEnum;
 
-$indexColumns = [
- 'name' => [
-    'type' => 'link',
-    'model' => 'person',
-    'submodel' => 'primary_name',
-    'field' => 'full_name',
-    'class' => 'cm-modal-link nospin', // launch this in a modal 
-    'dataAttrs' => [
-      ['data-cm-modal-title', __d('controller', 'GroupMembers', 1)]
-    ]
-// XXX not clear how to sort on submodel, but maybe just leave it for UX revisions?
-//    'sortable' => 'PrimaryName.family'
-  ],
-  'status' => [
-    'type' => 'enum',
-    'model' => 'person',
-    'field' => 'status',
-    'class' => 'StatusEnum'
-  ],
-  'source' => [
-    'type' => 'closure',
-    'function' => function ($entity) {
-      if(!empty($entity->group_nesting_id)) {
-        if(!empty($entity->group_nesting->group->name)) {
-          return $this->Html->link($entity->group_nesting->group->name,
-                                   ['controller' => 'groups', 'action' => 'edit', $entity->group_nesting->group->id]);
+/* There are two use cases for this index view: 
+   1. A list of Group Members for a group. The URL will contain ?group_id=n.
+   2. A list of Groups for a person. The URL will contain ?person_id=n.
+   
+   The display for each use case is nestled into different subnavigation, where 
+   group_id=n is on the "Group Members" tab in Group subnavigation, and 
+   person_id=n is on the "Groups" tab in Person navigation.
+   The configuration below will branch based on the existence of the query parameter.  
+*/
+
+// Check for the Group Members use case:
+if ($this->request->getQuery('group_id') !== null) {
+
+  $indexColumns = [
+    'name' => [
+      'type' => 'link',
+      'model' => 'person',
+      'submodel' => 'primary_name',
+      'field' => 'full_name',
+      'class' => 'cm-modal-link nospin', // launch this in a modal 
+      'dataAttrs' => [
+        ['data-cm-modal-title', __d('controller', 'GroupMembers', 1)]
+      ]
+      // XXX not clear how to sort on submodel, but maybe just leave it for UX revisions?
+      //    'sortable' => 'PrimaryName.family'
+    ],
+    'status' => [
+      'type' => 'enum',
+      'model' => 'person',
+      'field' => 'status',
+      'class' => 'StatusEnum'
+    ],
+    'source' => [
+      'type' => 'closure',
+      'function' => function($entity) {
+        if(!empty($entity->group_nesting_id)) {
+          if(!empty($entity->group_nesting->group->name)) {
+            return $this->Html->link($entity->group_nesting->group->name,
+              ['controller' => 'groups', 'action' => 'edit', $entity->group_nesting->group->id]);
+          } else {
+            return __d('controller', 'GroupNestings', [1]);
+          }
         } else {
-          return __d('controller', 'GroupNestings', [1]);
+          return __d('field', 'GroupMembers.source.direct');
         }
-      } else {
-        return __d('field', 'GroupMembers.source.direct');
       }
-    }
-  ],
-  'valid_from' => [
-    'type' => 'datetime'
-  ],
-  'valid_through' => [
-    'type' => 'datetime'
-  ]
-];
-
-// Suppress the default add link
-$suppressAddLink = true;
-$topLinks = [
-/* 
-  // This "Add" link launches the add form in a modal with a autocomplete people picker as a field. 
-  // Leave it here as a reference until we have a similar field such as "sponsor" created. 
-  [
-    'icon' => 'Add',
-    'order' => 'Default',
-    'label' => __d('operation', 'add.a', [__d('controller', 'GroupMembers', 1)]),
-    'link' => [
-      'controller' => 'GroupMembers',
-      'action' => 'add'
     ],
-    'class' => 'cm-modal-link nospin', 
-    'dataAttrs' => [
-      ['data-cm-modal-title', __d('controller', 'GroupMembers', 1)]
+    'valid_from' => [
+      'type' => 'datetime'
+    ],
+    'valid_through' => [
+      'type' => 'datetime'
     ]
-  ]
-  */
-];
-
-
-// When the $bulkActions variable exists in a columns.inc config, the "Bulk edit" switch will appear in the index.
-// The array should contain a list of actions to be made available.
-$bulkActions = [BulkActionEnum::Delete];
+  ];
+  
+  $subnav = 'groups';
 
+  // Suppress the default add link
+  $suppressAddLink = true;
+  $topLinks = [
+    /* 
+      // This "Add" link launches the add form in a modal with a autocomplete people picker as a field. 
+      // Leave it here as a reference until we have a similar field such as "sponsor" created. 
+      [
+        'icon' => 'Add',
+        'order' => 'Default',
+        'label' => __d('operation', 'add.a', [__d('controller', 'GroupMembers', 1)]),
+        'link' => [
+          'controller' => 'GroupMembers',
+          'action' => 'add'
+        ],
+        'class' => 'cm-modal-link nospin', 
+        'dataAttrs' => [
+          ['data-cm-modal-title', __d('controller', 'GroupMembers', 1)]
+        ]
+      ]
+      */
+  ];
+  
+  // When the $bulkActions variable exists in a columns.inc config, the "Bulk edit" switch will appear in the index.
+  // The array should contain a list of actions to be made available.
+  $bulkActions = [BulkActionEnum::Delete];
+  
+  // Page options
+  $peoplePicker = [
+    'label' => __d('operation', 'add.member'),
+    'viewConfigParameters' => [
+      'groupId' => $this->getRequest()?->getQuery('group_id')
+    ],
+    'actionUrl' => [
+      'plugin' => null,
+      'controller' => 'GroupMembers',
+      'action' => 'add',
+      '?' => [
+        'group_id' => $this->getRequest()?->getQuery('group_id')
+      ]
+    ]
+  ];
 
-// Page options
-$peoplePicker = [
-  'label' => __d('operation','add.member'),
-  'viewConfigParameters' => [
-    'groupId' => $this->getRequest()?->getQuery('group_id')
-  ],
-  'actionUrl' => [
-    'plugin'     => null,
-    'controller' => 'GroupMembers',
-    'action' => 'add',
-    '?' => [
-      'group_id' => $this->getRequest()?->getQuery('group_id')
+// Otherwise, we are in the Person's Groups use case:  
+} else {
+  
+  $indexColumns = [
+    'group' => [
+      'type' => 'link',
+      'model' => 'group',
+      'field' => 'name',
+      'class' => 'cm-modal-link nospin', // launch this in a modal 
+      'dataAttrs' => [
+        ['data-cm-modal-title', __d('controller', 'GroupMembers', 1)]
+      ]
+    ],
+    'description' => [
+      'type' => 'echo',
+      'model' => 'group',
+      'field' => 'description',
+    ],
+    'status' => [
+      'type' => 'enum',
+      'model' => 'group',
+      'field' => 'status',
+      'class' => 'SuspendableStatusEnum'
     ]
-  ]
-];
+  ];
+
+  $subnav = 'people';
+  $localTitle = __d('controller','Groups', 99);
+  
+  // Do not show the normal add link here
+  $suppressAddLink = true;
+}
diff --git a/app/templates/GroupNestings/columns.inc b/app/templates/GroupNestings/columns.inc
index eaed6e43c..22789d01a 100644
--- a/app/templates/GroupNestings/columns.inc
+++ b/app/templates/GroupNestings/columns.inc
@@ -64,11 +64,5 @@ $topLinks = [
 // Suppress the normal add link in lieu of the one above
 $suppressAddLink = true;
 
-/*
-// When the $bulkActions variable exists in a columns.inc config, the "Bulk edit" switch will appear in the index. 
-$bulkActions = [
-  // TODO: develop bulk actions. For now, use a placeholder.
-  'delete' => true
-];
-*/
+$subnav = 'groups';
 
diff --git a/app/templates/Groups/columns.inc b/app/templates/Groups/columns.inc
index aa12d515d..39001dfec 100644
--- a/app/templates/Groups/columns.inc
+++ b/app/templates/Groups/columns.inc
@@ -45,9 +45,6 @@ $indexColumns = [
   ]
 ];
 
-// $topLinks appear as an upper right menu
-$topLinks = [];
-
 // $rowActions appear as row-level menu items in the index view gear icon
 $rowActions = [
   [
diff --git a/app/templates/Groups/fields.inc b/app/templates/Groups/fields.inc
index f5b575bdc..0204aee68 100644
--- a/app/templates/Groups/fields.inc
+++ b/app/templates/Groups/fields.inc
@@ -40,6 +40,8 @@ $fields = [
   'nesting_mode_all' => $options
 ];
 
+$subnav = 'groups';
+
 if(!empty($parents)) {
   $fields['parent_id'] = [
     'fieldLabel' => __d('field', 'parent_id'),
diff --git a/app/templates/IdentifierAssignments/columns.inc b/app/templates/IdentifierAssignments/columns.inc
index da7f44414..f29879787 100644
--- a/app/templates/IdentifierAssignments/columns.inc
+++ b/app/templates/IdentifierAssignments/columns.inc
@@ -73,11 +73,3 @@ $rowActions = [
     'icon'    => 'electrical_services'
   ]
 ];
-  
-/*
-// When the $bulkActions variable exists in a columns.inc config, the "Bulk edit" switch will appear in the index. 
-$bulkActions = [
-  // TODO: develop bulk actions. For now, use a placeholder.
-  'delete' => true
-];
-*/
\ No newline at end of file
diff --git a/app/templates/IdentifierAssignments/fields.inc b/app/templates/IdentifierAssignments/fields.inc
index 8050a9417..73294910a 100644
--- a/app/templates/IdentifierAssignments/fields.inc
+++ b/app/templates/IdentifierAssignments/fields.inc
@@ -39,6 +39,9 @@ $fields = [
 ];
 
 $fields = array_merge($fields, include(ROOT . DS . 'templates' . DS . 'Standard/metadata.inc'));
+
+$subnav = 'standard';
+
 ?>
 
 <script>
diff --git a/app/templates/Identifiers/columns.inc b/app/templates/Identifiers/columns.inc
index 2bacb34bc..06d14a268 100644
--- a/app/templates/Identifiers/columns.inc
+++ b/app/templates/Identifiers/columns.inc
@@ -48,17 +48,3 @@ $rowActions = [
     }
   ]
 ];
-
-/*
-// When the $bulkActions variable exists in a columns.inc config, the "Bulk edit" switch will appear in the index. 
-$bulkActions = [
-  // TODO: develop bulk actions. For now, use a placeholder.
-  'delete' => true
-];
-*/
-
-$subnav = [
-  'name' => 'person',
-  'active' => 'person',
-  'subActive' => 'identifiers'
-];
\ No newline at end of file
diff --git a/app/templates/Names/columns.inc b/app/templates/Names/columns.inc
index c77cdbd10..8f219a1aa 100644
--- a/app/templates/Names/columns.inc
+++ b/app/templates/Names/columns.inc
@@ -50,17 +50,3 @@ $rowActions = [
     'if' => 'notPrimary'
   ]
 ];
-
-/*
-// When the $bulkActions variable exists in a columns.inc config, the "Bulk edit" switch will appear in the index. 
-$bulkActions = [
-  // TODO: develop bulk actions. For now, use a placeholder.
-  'delete' => true
-];
-*/
-
-$subnav = [
-  'name' => 'person',
-  'active' => 'person',
-  'subActive' => 'names'
-];
\ No newline at end of file
diff --git a/app/templates/People/columns.inc b/app/templates/People/columns.inc
index 703640d0a..ce9ea882c 100644
--- a/app/templates/People/columns.inc
+++ b/app/templates/People/columns.inc
@@ -63,11 +63,3 @@ $rowActions = [
     'icon' => 'history'
   ]
 ];
-
-/*
-// When the $bulkActions variable exists in a columns.inc config, the "Bulk edit" switch will appear in the index. 
-$bulkActions = [
-  // TODO: develop bulk actions. For now, use a placeholder.
-  'delete' => true
-];
-*/
\ No newline at end of file
diff --git a/app/templates/People/fields.inc b/app/templates/People/fields.inc
index 31945f409..dcd8074e9 100644
--- a/app/templates/People/fields.inc
+++ b/app/templates/People/fields.inc
@@ -63,6 +63,8 @@ $fields = array_merge($fields, [
   'date_of_birth'
 ]);
 
+$subnav = 'people';
+
 // List the MVEAs that may be shown on the mveaCanvas
 // When this array exists, the mveaCanvas.php element will render  
 $mveas = [
@@ -233,9 +235,3 @@ $addMenuLinks = [
     'icon' => 'link'
   ]
 ];
-
-$subnav = [
-  'name' => 'person',
-  'active' => 'person',
-  'subActive' => 'properties'
-];
\ No newline at end of file
diff --git a/app/templates/PersonRoles/columns.inc b/app/templates/PersonRoles/columns.inc
index b9469bf4d..9e5b5d9bc 100644
--- a/app/templates/PersonRoles/columns.inc
+++ b/app/templates/PersonRoles/columns.inc
@@ -48,15 +48,4 @@ $indexColumns = [
   ]
 ];
 
-/*
-// When the $bulkActions variable exists in a columns.inc config, the "Bulk edit" switch will appear in the index. 
-$bulkActions = [
-  // TODO: develop bulk actions. For now, use a placeholder.
-  'delete' => true
-];
-*/
-
-$subnav = [
-  'name' => 'person',
-  'active' => 'person_roles'
-];
\ No newline at end of file
+$subnav = 'people';
diff --git a/app/templates/PersonRoles/fields.inc b/app/templates/PersonRoles/fields.inc
index ca4a15c60..68b50d1c3 100644
--- a/app/templates/PersonRoles/fields.inc
+++ b/app/templates/PersonRoles/fields.inc
@@ -70,6 +70,8 @@ if($vv_action == 'edit' || $vv_action == 'view') {
   ];
 }
 
+$subnav = 'people';
+
 // List the MVEAs that may be shown on the mveaCanvas
 // When this array exists, the mveaCanvas.php element will render  
 $mveas = [
@@ -102,9 +104,3 @@ $addMenuLinks = [
     'icon' => 'phone'
   ]
 ];
-
-$subnav = [
-  'name' => 'person',
-  'active' => 'person_roles',
-  'subActive' => 'properties'
-];
\ No newline at end of file
diff --git a/app/templates/Petitions/columns.inc b/app/templates/Petitions/columns.inc
index 8220817fe..2022518a2 100644
--- a/app/templates/Petitions/columns.inc
+++ b/app/templates/Petitions/columns.inc
@@ -77,6 +77,8 @@ $indexColumns = [
   ]
 ];
 
+$subnav = 'petitions';
+
 // $rowActions appear as row-level menu items in the index view gear icon
 $rowActions = [
   [
diff --git a/app/templates/Pipelines/columns.inc b/app/templates/Pipelines/columns.inc
index ca5bda3e6..9b3af2459 100644
--- a/app/templates/Pipelines/columns.inc
+++ b/app/templates/Pipelines/columns.inc
@@ -36,10 +36,3 @@ $indexColumns = [
     'sortable' => true
   ]
 ];
-
-/*
-// TODO: develop $bulkActions. For now, use a placeholder. 
-$bulkActions = [
-  'delete' => true
-];
-*/
\ No newline at end of file
diff --git a/app/templates/Pronouns/columns.inc b/app/templates/Pronouns/columns.inc
index 96e36cd99..925fe8a0f 100644
--- a/app/templates/Pronouns/columns.inc
+++ b/app/templates/Pronouns/columns.inc
@@ -37,17 +37,3 @@ $indexColumns = [
     'class' => 'LanguageEnum'
   ]
 ];
-
-/*
-// When the $bulkActions variable exists in a columns.inc config, the "Bulk edit" switch will appear in the index. 
-$bulkActions = [
-  // TODO: develop bulk actions. For now, use a placeholder.
-  'delete' => true
-];
-*/
-
-$subnav = [
-  'name' => 'person',
-  'active' => 'person',
-  'subActive' => 'pronouns'
-];
\ No newline at end of file
diff --git a/app/templates/ProvisioningTargets/columns.inc b/app/templates/ProvisioningTargets/columns.inc
index 3420174fd..d347109a4 100644
--- a/app/templates/ProvisioningTargets/columns.inc
+++ b/app/templates/ProvisioningTargets/columns.inc
@@ -59,11 +59,3 @@ $rowActions = [
     'if'      => 'isActive'
   ]
 ];
-
-/*
-// When the $bulkActions variable exists in a columns.inc config, the "Bulk edit" switch will appear in the index. 
-$bulkActions = [
-  // TODO: develop bulk actions. For now, use a placeholder.
-  'delete' => true
-];
-*/
\ No newline at end of file
diff --git a/app/templates/ProvisioningTargets/fields.inc b/app/templates/ProvisioningTargets/fields.inc
index e33cd9de2..21cba05f9 100644
--- a/app/templates/ProvisioningTargets/fields.inc
+++ b/app/templates/ProvisioningTargets/fields.inc
@@ -42,10 +42,8 @@ $fields = [
 
 $fields = array_merge($fields, include(ROOT . DS . 'templates' . DS . 'Standard/metadata.inc'));
 
-$subnav = [
-  'name' => 'plugin',
-  'active' => 'properties'
-];
+$subnav = 'standard';
+
 ?>
 
 <script>
diff --git a/app/templates/Servers/columns.inc b/app/templates/Servers/columns.inc
index 19e4ae6fa..28f2df24b 100644
--- a/app/templates/Servers/columns.inc
+++ b/app/templates/Servers/columns.inc
@@ -49,11 +49,3 @@ $rowActions = [
     'icon'    => 'electrical_services'
   ]
 ];
-
-/*
-// When the $bulkActions variable exists in a columns.inc config, the "Bulk edit" switch will appear in the index. 
-$bulkActions = [
-  // TODO: develop bulk actions. For now, use a placeholder.
-  'delete' => true
-];
-*/
\ No newline at end of file
diff --git a/app/templates/Servers/fields.inc b/app/templates/Servers/fields.inc
index ef247e116..f75fd850f 100644
--- a/app/templates/Servers/fields.inc
+++ b/app/templates/Servers/fields.inc
@@ -33,4 +33,19 @@ $fields = [
   ]
 ];
 
-$fields = array_merge($fields, include(ROOT . DS . 'templates' . DS . 'Standard/metadata.inc'));
\ No newline at end of file
+$fields = array_merge($fields, include(ROOT . DS . 'templates' . DS . 'Standard/metadata.inc'));
+
+// Match Servers have special subnavigation treatment (they have an extra tab for Match Server Attributes).
+if($vv_obj['plugin'] == 'CoreServer.MatchServers') {
+  $subnav = [
+    'tabs' => ['Servers', 'Servers.Plugin', 'CoreServer.MatchServerAttributes'],
+    'action' => [
+      'Servers' => ['edit'],
+      'Servers.Plugin' => ['edit'],
+      'CoreServer.MatchServerAttributes' => ['index']
+    ]
+  ];
+} else {
+  // Otherwise, servers get the standard subnavigation treatment.
+  $subnav = 'standard';  
+}
diff --git a/app/templates/Standard/add-edit-view.php b/app/templates/Standard/add-edit-view.php
index 21c1cbd13..1d89f2238 100644
--- a/app/templates/Standard/add-edit-view.php
+++ b/app/templates/Standard/add-edit-view.php
@@ -30,7 +30,9 @@
 //$action = $this->template;
 /** var string $modelsName */
 $modelsName = $this->getName();
-// $tablename = models
+$fullModelsName = !empty($this->getPlugin()) ? $this->getPlugin() . '.' . $modelsName : $modelsName;
+$modelsTable = $this->Tab->getModelTableReference($fullModelsName);
+
 // XXX backport to match?
 $tableName = \Cake\Utility\Inflector::tableize(\Cake\Utility\Inflector::singularize($this->name));
 
@@ -84,11 +86,11 @@
   $linkFilter = [$vv_primary_link => $this->request->getQuery($vv_primary_link)];
 }
 
-// Subnavigation
+// Subnavigation: turned on by setting the $subnav string in columns.inc or fields.inc
 $hasSubnav = false;
-if($vv_action !== 'add' && file_exists(ROOT . DS . 'templates' . DS . 'Standard/subnavigation.inc')) {
+if(!empty($subnav) && $vv_action !== 'add' && file_exists(ROOT . DS . 'templates' . DS . 'Standard/subnavigation.inc')) {
   include(ROOT . DS . 'templates' . DS . 'Standard/subnavigation.inc');
-  $hasSubnav = $this->get('hasSupertitle');
+  $hasSubnav = true;
 }
 
 // When under subnavigation we do not want a title with Edit or Add or View followed by a number.
@@ -113,10 +115,11 @@
 
 <div class="page-title-container">
   <div class="page-title">
+    <?php // $localTitle is an override set in fields.inc; $vv_title is set by the controller. ?>
     <?php if(!$hasSubnav): ?>
-      <h1><?= $title ?></h1>
+      <h1><?= !empty($localTitle) ? $localTitle : $vv_title ?></h1>
     <?php else: ?>
-      <h2><?= $title ?></h2>
+      <h2><?= !empty($localTitle) ? $localTitle : $vv_title ?></h2>
     <?php endif; ?>
   </div>
   <?php
@@ -205,10 +208,8 @@
   ?>
 </div>
   
-<?php if(!$hasSubnav): ?>
-  <?php /* Flash Messages are placed below the main title when there's no subnavigation. */ ?>
-  <?= $this->element('flash', $flashArgs) ?>
-<?php endif; ?>
+<?php /* Alerts and Flash Messages are placed below the title and subtitle. */ ?>
+<?= $this->element('flash', $flashArgs) ?>
 
 <?php
 $linkId = null;
diff --git a/app/templates/Standard/index.php b/app/templates/Standard/index.php
index bb72c437c..d46b6c1a1 100644
--- a/app/templates/Standard/index.php
+++ b/app/templates/Standard/index.php
@@ -37,6 +37,8 @@
 
 /** var string $modelsName */
 $modelsName = $this->getName();
+$fullModelsName = !empty($this->getPlugin()) ? $this->getPlugin() . '.' . $modelsName : $modelsName;
+$modelsTable = $this->Tab->getModelTableReference($fullModelsName);
 // $tablename = models
 // XXX backport to match?
 $tableName = Inflector::tableize(Inflector::singularize($this->name));
@@ -80,9 +82,9 @@
   $flashArgs['vv_alerts'] = $alerts;
 }
 
-// Subnavigation
+// Subnavigation: turned on by setting the $subnav string in columns.inc or fields.inc
 $hasSubnav = false;  
-if(file_exists(ROOT . DS . 'templates' . DS . 'Standard/subnavigation.inc')) {
+if(!empty($subnav) && file_exists(ROOT . DS . 'templates' . DS . 'Standard/subnavigation.inc')) {
   include(ROOT . DS . 'templates' . DS . 'Standard/subnavigation.inc');
   $hasSubnav = $this->get('hasSupertitle');
 }
@@ -90,10 +92,11 @@
 
 <div class="page-title-container">
   <div class="page-title">
+    <?php // $localTitle is an override set in columns.inc; $vv_title is set by the controller. ?>
     <?php if(!$hasSubnav): ?>
-      <h1><?= $vv_title; ?></h1>
+      <h1><?= !empty($localTitle) ? $localTitle : $vv_title ?></h1>
     <?php else: ?>
-      <h2><?= $vv_title; ?></h2>
+      <h2><?= !empty($localTitle) ? $localTitle : $vv_title ?></h2>
     <?php endif; ?>
   </div>
 
diff --git a/app/templates/Standard/subnavigation.inc b/app/templates/Standard/subnavigation.inc
index 9192aff94..29f4810ed 100644
--- a/app/templates/Standard/subnavigation.inc
+++ b/app/templates/Standard/subnavigation.inc
@@ -29,17 +29,144 @@
 
 declare(strict_types = 1);
 
-$fullModelsName = !empty($this->getPlugin()) ? $this->getPlugin() . '.' . $modelsName : $modelsName;
-$modelsTable = $this->Tab->getModelTableReference($fullModelsName);
-if(method_exists($modelsTable, 'getTabsConfig')) {
-  $tabsConfiguration = $modelsTable->getTabsConfig($vv_action);
-  $subnav = [
-    'flashArgs' => $flashArgs ?? [],
-    ...$tabsConfiguration
-  ];
+$modelsName = $this->getName();
+$tabsConfiguration = [];
+
+/**
+ * Subnavigation is established by setting a variable called $subnav in fields.inc/columns.inc  
+ * either to a string that matches a named set from the $subnavConfig[] array below
+ * or by setting $subnav = [a local tab definition array].
+ * 
+ * For core views, the tab definition will typically reference a named set below,
+ * e.g. $subnav = 'people', or $subnav = 'standard'.
+ * 
+ * For plugins, the tab definition will typically be local in the plugin fields.inc config.
+ * For example (in app/availableplugins/PasswordAuthenticator/templates/PasswordAuthenticators/fields.inc):
+ * $subnav = [
+ *   'tabs' => ['Authenticators', 'PasswordAuthenticator.PasswordAuthenticators'],
+ *   'action' => [
+ *     'Authenticators' => ['edit'],
+ *     'PasswordAuthenticator.PasswordAuthenticators' => ['edit']
+ *   ]
+ * ]
+ * 
+ * Note that the 'tabs' array may use associative arrays rather than strings to pass in a custom tab label. 
+ * See $subnavConfig['people']['tabs'] below.
+ */
+  
+// Subnavigation configuration definitions for common subnavigation sets.
+// These are here to avoid duplicate configurations when handling core views.
+$subnavConfig = [
+  // STANDARD: for any object that has a simple two-tab set of "PROPERTIES" and "PLUGIN CONFIGURATION".
+  // Use $subnav = 'standard' for the properties tab; each plugin tab definition will live in the 
+  // plugin fields.inc config as $subnav = [the tab definition array]
+  // as described above.
+  'standard' => [
+    'tabs' => [$modelsName, $modelsName . '.Plugin'],
+    'action' => [
+      $modelsName => ['edit'],
+      $modelsName . '.Plugin' => ['edit']
+    ]
+  ],
+  
+  // PEOPLE
+  'people' => [
+    // Ordered list of Tabs
+    'tabs' => [
+      'People', 'PersonRoles', 'ExternalIdentities',
+      [
+        // A tab may be defined as just a model name (as above)
+        // or as an associative array using the following form.
+        // This allows for a custom label. 
+        'tabModel' => 'GroupMembers',
+        'tabLabel' => __d('controller','Groups', 99)
+      ]
+    ],
+    // What actions will include the subnavigation header
+    'action' => [
+      'People' => ['edit', 'view'],
+      'PersonRoles' => ['edit','view','index'],
+      'ExternalIdentities' => ['edit','view','index'],
+      'GroupMembers' => ['index']
+    ],
+    // What model will have a counter-badge after the tab title
+    'counter' => ['PersonRoles', 'ExternalIdentities', 'GroupMembers'],
+    'nested' => [
+      // Ordered list of Tabs
+      'tabs' => ['ExternalIdentities', 'ExternalIdentityRoles'],
+      // What actions will include the subnavigation header
+      'action' => [
+        // If a model renders in a subnavigation mode in edit/view mode, it cannot
+        // render in index mode for the same use case/context
+        // XXX edit should go first.
+        'ExternalIdentities' => ['edit', 'view'],
+        'ExternalIdentityRoles' => ['edit', 'view', 'index'],
+      ],
+      // What model will have a counter-badge after the tab title
+      'counter' => ['ExternalIdentityRoles'],
+    ]
+  ],
+  
+  // GROUPS
+  'groups' => [
+    'tabs' => ['Groups', 'GroupMembers', 'GroupNestings'],
+    'action' => [
+      'Groups' => ['edit', 'view'],
+      'GroupMembers' => ['index'],
+      'GroupNestings' => ['index'],
+    ],
+    'counter' => ['GroupMembers']
+  ],
+  
+  // ENROLLMENT FLOWS and PETITIONS
+  'petitions' => [
+    'tabs' => ['EnrollmentFlows', 'EnrollmentFlowSteps', 'Petitions'],
+    'action' => [
+      'EnrollmentFlows' => ['edit', 'view'],
+      'EnrollmentFlowSteps' => ['index'],
+      'Petitions' => ['index'],
+    ],
+    'counter' => ['EnrollmentFlowSteps', 'Petitions']
+  ],
+  
+  // ENROLLMENT FLOW STEPS
+  'steps' => [
+    'tabs' => ['EnrollmentFlowSteps', 'EnrollmentFlowSteps.Plugin', 'EnrollmentFlowSteps.Hierarchy'],
+    'action' => [
+      'EnrollmentFlowSteps' => ['edit', 'view'],
+      'EnrollmentFlowSteps.Plugin' => ['edit'],
+      // This means that we are looking at the plugins associated model
+      // EnrollmentFlowSteps -> plugin -> @plugin
+      // XXX There might be plugins that have no hasMany associations. We will check
+      //     for these use cases inside the element.
+      'EnrollmentFlowSteps.Hierarchy' => ['index']
+    ],
+  ],
+  
+  // EXTERNAL IDENTITY SOURCES
+  'eis' => [
+    'tabs' => ['ExternalIdentitySources', 'ExternalIdentitySources.Plugin', 'ExternalIdentitySources@action.search'],
+    'action' => [
+      'ExternalIdentitySources' => ['edit', 'view', 'search'],
+      'ExternalIdentitySources.Plugin' => ['edit'],
+      'ExternalIdentitySources@action.search' => [],
+    ],
+  ],
+];
+
+// Do not render subnavigation if $subnav is empty or if we have no configuration array. 
+if(!empty($subnav) && (is_array($subnav) || (is_string($subnav) && !empty($subnavConfig[$subnav])))) {
+  if(is_array($subnav)) {
+    // We are rendering a locally configured tabs configuration set in fields.inc or columns.inc.
+    $tabsConfiguration = $subnav;
+  } else {
+    // We are rendering a standard set of tabs as defined in $subnavConfig above.
+    $tabsConfiguration = $subnavConfig[$subnav];  
+  }
+  
   if(!empty($topLinks) && $vv_action == 'edit') {
     // Pass along the toplink. These are useful for building the action menu and the plugin sub navigation
-    $subnav['topLinks'] = $topLinks;
+    $subnavAttr['topLinks'] = $topLinks;
   }
   if (
     ( // Simple use case
@@ -51,7 +178,11 @@ if(method_exists($modelsTable, 'getTabsConfig')) {
       isset($tabsConfiguration['nested']['action'][$fullModelsName])
       && in_array($vv_action, $tabsConfiguration['nested']['action'][$fullModelsName], true)
     )
+    ||
+    ( // Special case enrollment flow steps
+      $subnav = 'steps'
+    )
   ) {
-    print $this->element('subnavigation/navBar', ['subNavAttributes' => $subnav]);
+    print $this->element('subnavigation/navBar', ['subNavAttributes' => $tabsConfiguration]);
   }
 }
\ No newline at end of file
diff --git a/app/templates/TelephoneNumbers/columns.inc b/app/templates/TelephoneNumbers/columns.inc
index d01535f16..6b2eff199 100644
--- a/app/templates/TelephoneNumbers/columns.inc
+++ b/app/templates/TelephoneNumbers/columns.inc
@@ -33,17 +33,3 @@ $indexColumns = [
     'type' => 'fk'
   ]
 ];
-
-/*
-// When the $bulkActions variable exists in a columns.inc config, the "Bulk edit" switch will appear in the index. 
-$bulkActions = [
-  // TODO: develop bulk actions. For now, use a placeholder.
-  'delete' => true
-];
-*/
-
-$subnav = [
-  'name' => 'person',
-  'active' => 'person',
-  'subActive' => 'telephone_numbers'
-];
\ No newline at end of file
diff --git a/app/templates/TrafficDetours/columns.inc b/app/templates/TrafficDetours/columns.inc
index 55003e341..6fc585fdb 100644
--- a/app/templates/TrafficDetours/columns.inc
+++ b/app/templates/TrafficDetours/columns.inc
@@ -53,11 +53,3 @@ $rowActions = [
     'icon'    => 'electrical_services'
   ]
 ];
-
-/*
-// When the $bulkActions variable exists in a columns.inc config, the "Bulk edit" switch will appear in the index. 
-$bulkActions = [
-  // TODO: develop bulk actions. For now, use a placeholder.
-  'delete' => true
-];
-*/
\ No newline at end of file
diff --git a/app/templates/Types/columns.inc b/app/templates/Types/columns.inc
index e436d2be4..7054db397 100644
--- a/app/templates/Types/columns.inc
+++ b/app/templates/Types/columns.inc
@@ -57,14 +57,3 @@ $topLinks = [
     'class' => ''
   ]
 ];
-
-// $rowActions appear as row-level menu items in the index view gear icon
-$rowActions = [];
-
-/*
-// When the $bulkActions variable exists in a columns.inc config, the "Bulk edit" switch will appear in the index. 
-$bulkActions = [
-  // TODO: develop bulk actions. For now, use a placeholder.
-  'delete' => true
-];
-*/
\ No newline at end of file
diff --git a/app/templates/Urls/columns.inc b/app/templates/Urls/columns.inc
index 71f8c775c..dfcedffe4 100644
--- a/app/templates/Urls/columns.inc
+++ b/app/templates/Urls/columns.inc
@@ -33,17 +33,3 @@ $indexColumns = [
     'type' => 'fk'
   ]
 ];
-
-/*
-// When the $bulkActions variable exists in a columns.inc config, the "Bulk edit" switch will appear in the index. 
-$bulkActions = [
-  // TODO: develop bulk actions. For now, use a placeholder.
-  'delete' => true
-];
-*/
-
-$subnav = [
-  'name' => 'person',
-  'active' => 'person',
-  'subActive' => 'urls'
-];
\ No newline at end of file
diff --git a/app/templates/element/subnavigation/navBar.php b/app/templates/element/subnavigation/navBar.php
index fe5a27886..67c770f63 100644
--- a/app/templates/element/subnavigation/navBar.php
+++ b/app/templates/element/subnavigation/navBar.php
@@ -54,9 +54,6 @@
     </div>
     <?= $this->element('subnavigation/upperButtons') ?>
   </div>
-
-  <!-- Flash Messages are placed below supertitle when subnavigation exists. -->
-  <?= $this->element('flash', $vv_subnavigation_flashArgs ?? []) ?>
   
   <!-- Top-Level Subnavigation Tabs -->  
   <nav id="cm-<?= $fullModelsName ?>-subnav-tabs" class="cm-subnav-tabs">
@@ -69,7 +66,7 @@
     // Do we have a nested element configured?
     !empty($subNavAttributes['nested'])
     // Check the nested elements if they allow navigation for this action
-    && in_array($vv_action, $subNavAttributes['nested']['action'][$fullModelsName], true)
+    && in_array($vv_action, $subNavAttributes['nested']['action'][$fullModelsName] ?? [], true)
   ): ?>
   <nav id="cm-<?= $fullModelsName ?>-subnav-links" class="cm-subnav-links">
     <ul class="list-inline">
diff --git a/app/templates/element/subnavigation/tabList.php b/app/templates/element/subnavigation/tabList.php
index 58e1791db..0bc9c8023 100644
--- a/app/templates/element/subnavigation/tabList.php
+++ b/app/templates/element/subnavigation/tabList.php
@@ -32,11 +32,16 @@
 $isNested = false;
 
 extract($vv_sub_nav_attributes, EXTR_PREFIX_ALL, 'vv_subnavigation');
+$nestings = $vv_subnavigation_nested['tabs'] ?? [];
 
 ?>
 
 <?php foreach($vv_subnavigation_tabs as $tab): ?>
 <?php
+  // If the tab is an array (used to pass in a custom label), extract the components
+  $tabLabel = is_array($tab) ? ($tab['tabLabel'] ?? null) : null;
+  $tab = is_array($tab) ? $tab['tabModel'] : $tab;
+
   // calculate the id
   $curId = $this->Tab->getCurrentId($tab, $isNested);
   // Check if there are child models. If not continue
@@ -57,14 +62,13 @@
   <li class="nav-item">
     <?php
     // Calculate Tab Title
-    $title = $this->element('subnavigation/tabTitle', compact('tab', 'curId', 'isNested'));
+    $title = $this->element('subnavigation/tabTitle', compact('tab', 'curId', 'isNested', 'tabLabel'));
     // Construct Target URL
     $url = $this->Tab->constructLinkUrl($tab, $curId, $isNested);
     // Calculate Tab Style Class(es)
-    $linkClass = $this->Tab->getLinkClass($tab, $isNested);
+    $linkClass = $this->Tab->getLinkClass($tab, $isNested, $nestings);
     // Import <a> element in the DOM
     print $this->Html->link($title, $url, ['class' => $linkClass, 'escape' => false]);
     ?>
   </li>
 <?php endforeach; ?>
-
diff --git a/app/templates/element/subnavigation/tabTitle.php b/app/templates/element/subnavigation/tabTitle.php
index 9c8c6fd16..f17c4b894 100644
--- a/app/templates/element/subnavigation/tabTitle.php
+++ b/app/templates/element/subnavigation/tabTitle.php
@@ -53,12 +53,12 @@
 
 // Simple use case
 $tabLanguageKey = in_array('index', $navigation_action[$tab], true) ? $tab : 'Properties';
-$title = __d('controller', $tabLanguageKey, [99]);
+$title = !empty($tabLabel) ? $tabLabel : __d('controller', $tabLanguageKey, [99]);
 $tabToTableName = Inflector::tableize(Inflector::singularize($tab));
 
 // Plugin Configuration Tab
 if (str_contains($tab, '.') && in_array('edit', $navigation_action[$tab], true)) {
-  $title = 'Configure Plugin';
+  $title = __d('operation','configure.plugin');
 } else if (str_contains($tab, '@action.')) { // Top Links/Actions
   [$modelName, ] = explode('@', $tab);
   [, $action] = explode('.', $tab);