fix: template fixes, updates and refactors

tests/unit/containers/__snapshots__/TheHeader.spec.js.snap

@@ -9,23 +9,24 @@ exports[`TheHeader.vue renders correctly 1`] = `
   withsubheader="true"
 >
   <ctoggler-stub
-    class="c-header-toggler ml-3 d-lg-none"
+    class="ml-3 d-lg-none"
     inheader="true"
     tag="button"
   />
    
   <ctoggler-stub
-    class="c-header-toggler ml-3 d-md-down-none"
+    class="ml-3 d-md-down-none"
     inheader="true"
     tag="button"
   />
    
-  <img
+  <cheaderbrand
     alt="CoreUI Logo"
-    class="c-header-brand mx-auto d-lg-none"
+    class="mx-auto d-lg-none"
     height="46"
     src="img/brand/coreui-base.svg"
     width="97"
+    wrappedinlink="[object Object]"
   />
    
   <cheadernav-stub
@@ -119,12 +120,12 @@ exports[`TheHeader.vue renders correctly 1`] = `
     <theheaderdropdownaccnt-stub />
   </cheadernav-stub>
    
-  <div
-    class="c-subheader px-3"
+  <csubheader
+    class="px-3"
   >
     <cbreadcrumbrouter-stub
       class="border-0"
     />
-  </div>
+  </csubheader>
 </cheader-stub>
 `;