diff --git a/app/templates/Standard/add-edit-view.php b/app/templates/Standard/add-edit-view.php
index 6db60a260..8925cddf8 100644
--- a/app/templates/Standard/add-edit-view.php
+++ b/app/templates/Standard/add-edit-view.php
@@ -61,26 +61,16 @@
   //     the fields (which would be more consistent with how Views render...)
   $flashArgs['vv_banners'] = $banners;
 }
-?>
 
-<?php if(!empty($subnav)): ?>
-  <div id="subnavigation">
-    <div class="supertitle">
-      <h1>
-        <?php if(!empty($vv_supertitle)): ?>
-          <?= $vv_supertitle; ?>
-        <?php elseif(!empty($vv_obj)): ?>
-          <?= $vv_obj->$vv_display_field; ?>
-        <?php endif; ?>
-      </h1>
-    </div>
-    
-    <?php /* Flash Messages are placed below supertitle when subnavigation exists. */ ?>
-    <?= $this->element('flash', $flashArgs); ?>
-    
-    <?= $this->element('subnavigation', $subnav); ?>
-  </div>
-<?php endif; ?>
+// If subnavigation is present a supertitle and the subnavigation will be placed above
+// the normal page title. The flash messages will be shown up there as well.
+if(!empty($subnav)) {
+  // Include the $flashArgs for the subnavigation element
+  $subnav['flashArgs'] = $flashArgs;
+  // Generate the subnavigation title and tabs
+  print $this->element('subnavigation', $subnav);
+}
+?>
 
 <div class="pageTitleContainer">
   <div class="pageTitle">
@@ -88,7 +78,7 @@
       <h1><?= $vv_title; ?></h1>
     <?php else: ?>
       <?php if(
-        // Subnavigation contains an h2 for these entities
+        // Subnavigation contains an h2 for these entities, so we need an h3
         $vv_primary_link == 'person_role_id'
         || $vv_primary_link == 'external_identity_id'
         || $vv_primary_link == 'external_identity_role_id'
diff --git a/app/templates/Standard/index.php b/app/templates/Standard/index.php
index 86aff7656..7b7071c0d 100644
--- a/app/templates/Standard/index.php
+++ b/app/templates/Standard/index.php
@@ -67,26 +67,16 @@
 if(!empty($banners)) {
   $flashArgs['vv_banners'] = $banners;
 }
-?>
 
-<?php if(!empty($subnav)): ?>
-  <div id="subnavigation">
-    <div class="supertitle">
-      <h1>
-        <?php if(!empty($vv_person_name)): ?>
-          <?= $vv_person_name->full_name; ?>
-        <?php elseif(!empty($vv_bc_parent_obj)): ?>
-          <?= $vv_bc_parent_obj->$vv_bc_parent_displayfield; ?>
-        <?php endif; ?>
-      </h1>
-    </div>
-
-    <?php /* Flash Messages are placed below supertitle when subnavigation exists. */ ?>
-    <?= $this->element('flash', $flashArgs); ?>
-    
-    <?= $this->element('subnavigation', $subnav); ?>
-  </div>
-<?php endif; ?>
+// If subnavigation is present a supertitle and the subnavigation will be placed above
+// the normal page title. The flash messages will be shown up there as well.
+if(!empty($subnav)) {
+  // Include the $flashArgs for the subnavigation element
+  $subnav['flashArgs'] = $flashArgs;
+  // Generate the subnavigation title and tabs
+  print $this->element('subnavigation', $subnav);
+}
+?>
 
 <div class="pageTitleContainer">
   <div class="pageTitle">
@@ -94,7 +84,7 @@
       <h1><?= $vv_title; ?></h1>
     <?php else: ?>
       <?php if(
-        // Subnavigation contains an h2 for these entities
+        // Subnavigation contains an h2 for these entities, so we need an h3
         $vv_primary_link == 'person_role_id'
         || $vv_primary_link == 'external_identity_id'
         || $vv_primary_link == 'external_identity_role_id'): ?>
diff --git a/app/templates/element/subnavigation.php b/app/templates/element/subnavigation.php
index e6a1c840b..8d23e4262 100644
--- a/app/templates/element/subnavigation.php
+++ b/app/templates/element/subnavigation.php
@@ -31,6 +31,7 @@
 use Cake\View\Helper;
 
 $linkFilter = [];
+$flashArgs = [];
 $curId = NULL;
 $curController = $this->request->getParam('controller');
 $curAction = $this->request->getParam('action');
@@ -92,7 +93,8 @@
           <?= __d('enumeration', 'StatusEnum.' . $vv_obj['status']); ?>
         </span>
       <?php endif; ?>
-    </div>  
+    </div>
+    
     <?php if($name == 'person'): ?>
       <!-- Specialty person dropdown menus - ADD and global actions -->
       <nav id="person-actions">
@@ -239,6 +241,9 @@
       </nav>
     <?php endif; // person-actions ?>
   </div>
+
+  <?php /* Flash Messages are placed below supertitle when subnavigation exists. */ ?>
+  <?= $this->element('flash', $flashArgs); ?>
   
   <!-- Top-Level Subnavigation Tabs -->  
   <nav id="cm-<?= $name ?>-subnav-tabs" class="cm-subnav-tabs">