diff --git a/css/styles.css b/css/styles.css
index 6a9df08fc24306e44083508ad25cd6c583eaa393..92456b6b293dfcdfe85ecf604d46a0c25ee1cdc3 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -4261,37 +4261,43 @@ fieldset,
     .org-default .uw-horizontal-nav .uw-site-home__link:hover svg {
       fill: #000; }
 
+.org-default .uw-horizontal-nav .menu--horizontal > .is-active-trail {
+  background-color: #ccc;
+  color: #000; }
+
 .org-default .uw-horizontal-nav .menu--horizontal li.submenu-active > a {
   background-color: #ccc;
   color: #000; }
 
 .org-default .uw-horizontal-nav .menu--horizontal li > a {
   color: #000; }
-  .org-default .uw-horizontal-nav .menu--horizontal li > a:focus, .org-default .uw-horizontal-nav .menu--horizontal li > a.is-active-trail {
+  .org-default .uw-horizontal-nav .menu--horizontal li > a:focus {
     background-color: #ccc;
     color: #000; }
-  .org-default .uw-horizontal-nav .menu--horizontal li > a:active {
+  .org-default .uw-horizontal-nav .menu--horizontal li > a.active {
     background-color: #ccc;
     color: #000; }
   .org-default .uw-horizontal-nav .menu--horizontal li > a:hover {
     background-color: #fff;
     color: #000; }
 
+.org-default .uw-horizontal-nav .menu--horizontal li .menu--subnav .is-active-trail > a {
+  border-bottom: 2px solid #000; }
+
 .org-default .uw-horizontal-nav .menu--horizontal li .menu--subnav a {
   background-color: transparent;
-  border-bottom: 3px solid transparent;
+  border-bottom: 2px solid transparent;
   text-decoration: none; }
-  .org-default .uw-horizontal-nav .menu--horizontal li .menu--subnav a:focus, .org-default .uw-horizontal-nav .menu--horizontal li .menu--subnav a.is-active-trail {
-    background-color: inherit;
-    border-bottom: 3px solid #ccc;
-    color: #000; }
-  .org-default .uw-horizontal-nav .menu--horizontal li .menu--subnav a:active {
-    background-color: inherit;
-    border-bottom: 3px solid #ccc; }
-  .org-default .uw-horizontal-nav .menu--horizontal li .menu--subnav a:hover {
+  .org-default .uw-horizontal-nav .menu--horizontal li .menu--subnav a.active {
     background-color: inherit;
-    border-bottom: 3px solid #ccc;
+    border-bottom: 2px solid #000;
     color: #000; }
+    .org-default .uw-horizontal-nav .menu--horizontal li .menu--subnav a.active::after {
+      display: none; }
+    .org-default .uw-horizontal-nav .menu--horizontal li .menu--subnav a.active:hover {
+      background-color: inherit;
+      border-bottom: 2px solid #ccc;
+      color: #000; }
 
 .org-ahs .uw-horizontal-nav .uw-site-home__link {
   background-color: #005963; }
@@ -4307,9 +4313,8 @@ fieldset,
       fill: #005963; }
 
 .org-ahs .uw-horizontal-nav .menu--horizontal > .is-active-trail {
-  border-top: 4px solid #005963; }
-  .org-ahs .uw-horizontal-nav .menu--horizontal > .is-active-trail.has-submenu::after {
-    border-top: 4px solid #005963; }
+  background-color: #ccc;
+  color: #000; }
 
 .org-ahs .uw-horizontal-nav .menu--horizontal li.submenu-active > a {
   background-color: #ccc;
@@ -4317,46 +4322,46 @@ fieldset,
 
 .org-ahs .uw-horizontal-nav .menu--horizontal li > a {
   color: #000; }
-  .org-ahs .uw-horizontal-nav .menu--horizontal li > a:focus, .org-ahs .uw-horizontal-nav .menu--horizontal li > a.is-active-trail {
-    background-color: #ccc;
-    color: #000; }
-  .org-ahs .uw-horizontal-nav .menu--horizontal li > a:active {
+  .org-ahs .uw-horizontal-nav .menu--horizontal li > a:focus, .org-ahs .uw-horizontal-nav .menu--horizontal li > a.active {
     background-color: #ccc;
     color: #000; }
   .org-ahs .uw-horizontal-nav .menu--horizontal li > a:hover {
     background-color: #fff;
     color: #000; }
 
+.org-ahs .uw-horizontal-nav .menu--horizontal li .menu--subnav .is-active-trail > a {
+  border-bottom: 2px solid #005963; }
+
 .org-ahs .uw-horizontal-nav .menu--horizontal li .menu--subnav a {
   background-color: transparent;
-  border-bottom: 3px solid transparent;
+  border-bottom: 2px solid transparent;
   text-decoration: none; }
   .org-ahs .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent {
     color: #005963; }
-    .org-ahs .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent:focus, .org-ahs .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent.is-active-trail {
-      background-color: inherit;
-      border-bottom: 3px solid #005963;
-      color: #005963; }
-    .org-ahs .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent:active {
+    .org-ahs .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent:focus, .org-ahs .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent.active {
       background-color: inherit;
-      border-bottom: 3px solid #005963;
+      border-bottom: 2px solid #005963;
       color: #005963; }
     .org-ahs .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent:hover {
       background-color: inherit;
-      border-bottom: 3px solid #005963;
+      border-bottom: 2px solid #005963;
       color: #005963; }
-  .org-ahs .uw-horizontal-nav .menu--horizontal li .menu--subnav a:focus, .org-ahs .uw-horizontal-nav .menu--horizontal li .menu--subnav a.is-active-trail {
+  .org-ahs .uw-horizontal-nav .menu--horizontal li .menu--subnav a:focus {
     background-color: inherit;
-    border-bottom: 3px solid #005963;
-    color: #005963; }
-  .org-ahs .uw-horizontal-nav .menu--horizontal li .menu--subnav a:active {
-    background-color: inherit;
-    border-bottom: 3px solid #005963;
+    border-bottom: 2px solid #005963;
     color: #005963; }
   .org-ahs .uw-horizontal-nav .menu--horizontal li .menu--subnav a:hover {
     background-color: inherit;
-    border-bottom: 3px solid #ccc;
+    border-bottom: 2px solid #ccc;
     color: #000; }
+  .org-ahs .uw-horizontal-nav .menu--horizontal li .menu--subnav a.active {
+    background-color: inherit;
+    border-bottom: 2px solid #000;
+    color: #000; }
+    .org-ahs .uw-horizontal-nav .menu--horizontal li .menu--subnav a.active:hover {
+      background-color: inherit;
+      border-bottom: 2px solid #ccc;
+      color: #000; }
 
 .org-art .uw-horizontal-nav .uw-site-home__link {
   background-color: #d93f00; }
@@ -4372,9 +4377,8 @@ fieldset,
       fill: #d93f00; }
 
 .org-art .uw-horizontal-nav .menu--horizontal > .is-active-trail {
-  border-top: 4px solid #d93f00; }
-  .org-art .uw-horizontal-nav .menu--horizontal > .is-active-trail.has-submenu::after {
-    border-top: 4px solid #d93f00; }
+  background-color: #ccc;
+  color: #000; }
 
 .org-art .uw-horizontal-nav .menu--horizontal li.submenu-active > a {
   background-color: #ccc;
@@ -4382,46 +4386,46 @@ fieldset,
 
 .org-art .uw-horizontal-nav .menu--horizontal li > a {
   color: #000; }
-  .org-art .uw-horizontal-nav .menu--horizontal li > a:focus, .org-art .uw-horizontal-nav .menu--horizontal li > a.is-active-trail {
-    background-color: #ccc;
-    color: #000; }
-  .org-art .uw-horizontal-nav .menu--horizontal li > a:active {
+  .org-art .uw-horizontal-nav .menu--horizontal li > a:focus, .org-art .uw-horizontal-nav .menu--horizontal li > a.active {
     background-color: #ccc;
     color: #000; }
   .org-art .uw-horizontal-nav .menu--horizontal li > a:hover {
     background-color: #fff;
     color: #000; }
 
+.org-art .uw-horizontal-nav .menu--horizontal li .menu--subnav .is-active-trail > a {
+  border-bottom: 2px solid #d93f00; }
+
 .org-art .uw-horizontal-nav .menu--horizontal li .menu--subnav a {
   background-color: transparent;
-  border-bottom: 3px solid transparent;
+  border-bottom: 2px solid transparent;
   text-decoration: none; }
   .org-art .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent {
     color: #d93f00; }
-    .org-art .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent:focus, .org-art .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent.is-active-trail {
-      background-color: inherit;
-      border-bottom: 3px solid #d93f00;
-      color: #d93f00; }
-    .org-art .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent:active {
+    .org-art .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent:focus, .org-art .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent.active {
       background-color: inherit;
-      border-bottom: 3px solid #d93f00;
+      border-bottom: 2px solid #d93f00;
       color: #d93f00; }
     .org-art .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent:hover {
       background-color: inherit;
-      border-bottom: 3px solid #d93f00;
+      border-bottom: 2px solid #d93f00;
       color: #d93f00; }
-  .org-art .uw-horizontal-nav .menu--horizontal li .menu--subnav a:focus, .org-art .uw-horizontal-nav .menu--horizontal li .menu--subnav a.is-active-trail {
+  .org-art .uw-horizontal-nav .menu--horizontal li .menu--subnav a:focus {
     background-color: inherit;
-    border-bottom: 3px solid #d93f00;
-    color: #d93f00; }
-  .org-art .uw-horizontal-nav .menu--horizontal li .menu--subnav a:active {
-    background-color: inherit;
-    border-bottom: 3px solid #d93f00;
+    border-bottom: 2px solid #d93f00;
     color: #d93f00; }
   .org-art .uw-horizontal-nav .menu--horizontal li .menu--subnav a:hover {
     background-color: inherit;
-    border-bottom: 3px solid #ccc;
+    border-bottom: 2px solid #ccc;
     color: #000; }
+  .org-art .uw-horizontal-nav .menu--horizontal li .menu--subnav a.active {
+    background-color: inherit;
+    border-bottom: 2px solid #000;
+    color: #000; }
+    .org-art .uw-horizontal-nav .menu--horizontal li .menu--subnav a.active:hover {
+      background-color: inherit;
+      border-bottom: 2px solid #ccc;
+      color: #000; }
 
 .org-eng .uw-horizontal-nav .uw-site-home__link {
   background-color: #57058b; }
@@ -4437,9 +4441,8 @@ fieldset,
       fill: #57058b; }
 
 .org-eng .uw-horizontal-nav .menu--horizontal > .is-active-trail {
-  border-top: 4px solid #57058b; }
-  .org-eng .uw-horizontal-nav .menu--horizontal > .is-active-trail.has-submenu::after {
-    border-top: 4px solid #57058b; }
+  background-color: #ccc;
+  color: #000; }
 
 .org-eng .uw-horizontal-nav .menu--horizontal li.submenu-active > a {
   background-color: #ccc;
@@ -4447,46 +4450,46 @@ fieldset,
 
 .org-eng .uw-horizontal-nav .menu--horizontal li > a {
   color: #000; }
-  .org-eng .uw-horizontal-nav .menu--horizontal li > a:focus, .org-eng .uw-horizontal-nav .menu--horizontal li > a.is-active-trail {
-    background-color: #ccc;
-    color: #000; }
-  .org-eng .uw-horizontal-nav .menu--horizontal li > a:active {
+  .org-eng .uw-horizontal-nav .menu--horizontal li > a:focus, .org-eng .uw-horizontal-nav .menu--horizontal li > a.active {
     background-color: #ccc;
     color: #000; }
   .org-eng .uw-horizontal-nav .menu--horizontal li > a:hover {
     background-color: #fff;
     color: #000; }
 
+.org-eng .uw-horizontal-nav .menu--horizontal li .menu--subnav .is-active-trail > a {
+  border-bottom: 2px solid #57058b; }
+
 .org-eng .uw-horizontal-nav .menu--horizontal li .menu--subnav a {
   background-color: transparent;
-  border-bottom: 3px solid transparent;
+  border-bottom: 2px solid transparent;
   text-decoration: none; }
   .org-eng .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent {
     color: #57058b; }
-    .org-eng .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent:focus, .org-eng .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent.is-active-trail {
-      background-color: inherit;
-      border-bottom: 3px solid #57058b;
-      color: #57058b; }
-    .org-eng .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent:active {
+    .org-eng .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent:focus, .org-eng .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent.active {
       background-color: inherit;
-      border-bottom: 3px solid #57058b;
+      border-bottom: 2px solid #57058b;
       color: #57058b; }
     .org-eng .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent:hover {
       background-color: inherit;
-      border-bottom: 3px solid #57058b;
+      border-bottom: 2px solid #57058b;
       color: #57058b; }
-  .org-eng .uw-horizontal-nav .menu--horizontal li .menu--subnav a:focus, .org-eng .uw-horizontal-nav .menu--horizontal li .menu--subnav a.is-active-trail {
-    background-color: inherit;
-    border-bottom: 3px solid #57058b;
-    color: #57058b; }
-  .org-eng .uw-horizontal-nav .menu--horizontal li .menu--subnav a:active {
+  .org-eng .uw-horizontal-nav .menu--horizontal li .menu--subnav a:focus {
     background-color: inherit;
-    border-bottom: 3px solid #57058b;
+    border-bottom: 2px solid #57058b;
     color: #57058b; }
   .org-eng .uw-horizontal-nav .menu--horizontal li .menu--subnav a:hover {
     background-color: inherit;
-    border-bottom: 3px solid #ccc;
+    border-bottom: 2px solid #ccc;
     color: #000; }
+  .org-eng .uw-horizontal-nav .menu--horizontal li .menu--subnav a.active {
+    background-color: inherit;
+    border-bottom: 2px solid #000;
+    color: #000; }
+    .org-eng .uw-horizontal-nav .menu--horizontal li .menu--subnav a.active:hover {
+      background-color: inherit;
+      border-bottom: 2px solid #ccc;
+      color: #000; }
 
 .org-env .uw-horizontal-nav .uw-site-home__link {
   background-color: #607000; }
@@ -4502,9 +4505,8 @@ fieldset,
       fill: #607000; }
 
 .org-env .uw-horizontal-nav .menu--horizontal > .is-active-trail {
-  border-top: 4px solid #607000; }
-  .org-env .uw-horizontal-nav .menu--horizontal > .is-active-trail.has-submenu::after {
-    border-top: 4px solid #607000; }
+  background-color: #ccc;
+  color: #000; }
 
 .org-env .uw-horizontal-nav .menu--horizontal li.submenu-active > a {
   background-color: #ccc;
@@ -4512,46 +4514,46 @@ fieldset,
 
 .org-env .uw-horizontal-nav .menu--horizontal li > a {
   color: #000; }
-  .org-env .uw-horizontal-nav .menu--horizontal li > a:focus, .org-env .uw-horizontal-nav .menu--horizontal li > a.is-active-trail {
-    background-color: #ccc;
-    color: #000; }
-  .org-env .uw-horizontal-nav .menu--horizontal li > a:active {
+  .org-env .uw-horizontal-nav .menu--horizontal li > a:focus, .org-env .uw-horizontal-nav .menu--horizontal li > a.active {
     background-color: #ccc;
     color: #000; }
   .org-env .uw-horizontal-nav .menu--horizontal li > a:hover {
     background-color: #fff;
     color: #000; }
 
+.org-env .uw-horizontal-nav .menu--horizontal li .menu--subnav .is-active-trail > a {
+  border-bottom: 2px solid #607000; }
+
 .org-env .uw-horizontal-nav .menu--horizontal li .menu--subnav a {
   background-color: transparent;
-  border-bottom: 3px solid transparent;
+  border-bottom: 2px solid transparent;
   text-decoration: none; }
   .org-env .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent {
     color: #607000; }
-    .org-env .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent:focus, .org-env .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent.is-active-trail {
+    .org-env .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent:focus, .org-env .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent.active {
       background-color: inherit;
-      border-bottom: 3px solid #607000;
-      color: #607000; }
-    .org-env .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent:active {
-      background-color: inherit;
-      border-bottom: 3px solid #607000;
+      border-bottom: 2px solid #607000;
       color: #607000; }
     .org-env .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent:hover {
       background-color: inherit;
-      border-bottom: 3px solid #607000;
+      border-bottom: 2px solid #607000;
       color: #607000; }
-  .org-env .uw-horizontal-nav .menu--horizontal li .menu--subnav a:focus, .org-env .uw-horizontal-nav .menu--horizontal li .menu--subnav a.is-active-trail {
-    background-color: inherit;
-    border-bottom: 3px solid #607000;
-    color: #607000; }
-  .org-env .uw-horizontal-nav .menu--horizontal li .menu--subnav a:active {
+  .org-env .uw-horizontal-nav .menu--horizontal li .menu--subnav a:focus {
     background-color: inherit;
-    border-bottom: 3px solid #607000;
+    border-bottom: 2px solid #607000;
     color: #607000; }
   .org-env .uw-horizontal-nav .menu--horizontal li .menu--subnav a:hover {
     background-color: inherit;
-    border-bottom: 3px solid #ccc;
+    border-bottom: 2px solid #ccc;
     color: #000; }
+  .org-env .uw-horizontal-nav .menu--horizontal li .menu--subnav a.active {
+    background-color: inherit;
+    border-bottom: 2px solid #000;
+    color: #000; }
+    .org-env .uw-horizontal-nav .menu--horizontal li .menu--subnav a.active:hover {
+      background-color: inherit;
+      border-bottom: 2px solid #ccc;
+      color: #000; }
 
 .org-mat .uw-horizontal-nav .uw-site-home__link {
   background-color: #c60078; }
@@ -4567,9 +4569,8 @@ fieldset,
       fill: #c60078; }
 
 .org-mat .uw-horizontal-nav .menu--horizontal > .is-active-trail {
-  border-top: 4px solid #c60078; }
-  .org-mat .uw-horizontal-nav .menu--horizontal > .is-active-trail.has-submenu::after {
-    border-top: 4px solid #c60078; }
+  background-color: #ccc;
+  color: #000; }
 
 .org-mat .uw-horizontal-nav .menu--horizontal li.submenu-active > a {
   background-color: #ccc;
@@ -4577,46 +4578,46 @@ fieldset,
 
 .org-mat .uw-horizontal-nav .menu--horizontal li > a {
   color: #000; }
-  .org-mat .uw-horizontal-nav .menu--horizontal li > a:focus, .org-mat .uw-horizontal-nav .menu--horizontal li > a.is-active-trail {
-    background-color: #ccc;
-    color: #000; }
-  .org-mat .uw-horizontal-nav .menu--horizontal li > a:active {
+  .org-mat .uw-horizontal-nav .menu--horizontal li > a:focus, .org-mat .uw-horizontal-nav .menu--horizontal li > a.active {
     background-color: #ccc;
     color: #000; }
   .org-mat .uw-horizontal-nav .menu--horizontal li > a:hover {
     background-color: #fff;
     color: #000; }
 
+.org-mat .uw-horizontal-nav .menu--horizontal li .menu--subnav .is-active-trail > a {
+  border-bottom: 2px solid #c60078; }
+
 .org-mat .uw-horizontal-nav .menu--horizontal li .menu--subnav a {
   background-color: transparent;
-  border-bottom: 3px solid transparent;
+  border-bottom: 2px solid transparent;
   text-decoration: none; }
   .org-mat .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent {
     color: #c60078; }
-    .org-mat .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent:focus, .org-mat .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent.is-active-trail {
+    .org-mat .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent:focus, .org-mat .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent.active {
       background-color: inherit;
-      border-bottom: 3px solid #c60078;
-      color: #c60078; }
-    .org-mat .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent:active {
-      background-color: inherit;
-      border-bottom: 3px solid #c60078;
+      border-bottom: 2px solid #c60078;
       color: #c60078; }
     .org-mat .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent:hover {
       background-color: inherit;
-      border-bottom: 3px solid #c60078;
+      border-bottom: 2px solid #c60078;
       color: #c60078; }
-  .org-mat .uw-horizontal-nav .menu--horizontal li .menu--subnav a:focus, .org-mat .uw-horizontal-nav .menu--horizontal li .menu--subnav a.is-active-trail {
-    background-color: inherit;
-    border-bottom: 3px solid #c60078;
-    color: #c60078; }
-  .org-mat .uw-horizontal-nav .menu--horizontal li .menu--subnav a:active {
+  .org-mat .uw-horizontal-nav .menu--horizontal li .menu--subnav a:focus {
     background-color: inherit;
-    border-bottom: 3px solid #c60078;
+    border-bottom: 2px solid #c60078;
     color: #c60078; }
   .org-mat .uw-horizontal-nav .menu--horizontal li .menu--subnav a:hover {
     background-color: inherit;
-    border-bottom: 3px solid #ccc;
+    border-bottom: 2px solid #ccc;
+    color: #000; }
+  .org-mat .uw-horizontal-nav .menu--horizontal li .menu--subnav a.active {
+    background-color: inherit;
+    border-bottom: 2px solid #000;
     color: #000; }
+    .org-mat .uw-horizontal-nav .menu--horizontal li .menu--subnav a.active:hover {
+      background-color: inherit;
+      border-bottom: 2px solid #ccc;
+      color: #000; }
 
 .org-sci .uw-horizontal-nav .uw-site-home__link {
   background-color: #0033be; }
@@ -4632,9 +4633,8 @@ fieldset,
       fill: #0033be; }
 
 .org-sci .uw-horizontal-nav .menu--horizontal > .is-active-trail {
-  border-top: 4px solid #0033be; }
-  .org-sci .uw-horizontal-nav .menu--horizontal > .is-active-trail.has-submenu::after {
-    border-top: 4px solid #0033be; }
+  background-color: #ccc;
+  color: #000; }
 
 .org-sci .uw-horizontal-nav .menu--horizontal li.submenu-active > a {
   background-color: #ccc;
@@ -4642,46 +4642,46 @@ fieldset,
 
 .org-sci .uw-horizontal-nav .menu--horizontal li > a {
   color: #000; }
-  .org-sci .uw-horizontal-nav .menu--horizontal li > a:focus, .org-sci .uw-horizontal-nav .menu--horizontal li > a.is-active-trail {
-    background-color: #ccc;
-    color: #000; }
-  .org-sci .uw-horizontal-nav .menu--horizontal li > a:active {
+  .org-sci .uw-horizontal-nav .menu--horizontal li > a:focus, .org-sci .uw-horizontal-nav .menu--horizontal li > a.active {
     background-color: #ccc;
     color: #000; }
   .org-sci .uw-horizontal-nav .menu--horizontal li > a:hover {
     background-color: #fff;
     color: #000; }
 
+.org-sci .uw-horizontal-nav .menu--horizontal li .menu--subnav .is-active-trail > a {
+  border-bottom: 2px solid #0033be; }
+
 .org-sci .uw-horizontal-nav .menu--horizontal li .menu--subnav a {
   background-color: transparent;
-  border-bottom: 3px solid transparent;
+  border-bottom: 2px solid transparent;
   text-decoration: none; }
   .org-sci .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent {
     color: #0033be; }
-    .org-sci .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent:focus, .org-sci .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent.is-active-trail {
+    .org-sci .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent:focus, .org-sci .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent.active {
       background-color: inherit;
-      border-bottom: 3px solid #0033be;
-      color: #0033be; }
-    .org-sci .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent:active {
-      background-color: inherit;
-      border-bottom: 3px solid #0033be;
+      border-bottom: 2px solid #0033be;
       color: #0033be; }
     .org-sci .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent:hover {
       background-color: inherit;
-      border-bottom: 3px solid #0033be;
+      border-bottom: 2px solid #0033be;
       color: #0033be; }
-  .org-sci .uw-horizontal-nav .menu--horizontal li .menu--subnav a:focus, .org-sci .uw-horizontal-nav .menu--horizontal li .menu--subnav a.is-active-trail {
+  .org-sci .uw-horizontal-nav .menu--horizontal li .menu--subnav a:focus {
     background-color: inherit;
-    border-bottom: 3px solid #0033be;
-    color: #0033be; }
-  .org-sci .uw-horizontal-nav .menu--horizontal li .menu--subnav a:active {
-    background-color: inherit;
-    border-bottom: 3px solid #0033be;
+    border-bottom: 2px solid #0033be;
     color: #0033be; }
   .org-sci .uw-horizontal-nav .menu--horizontal li .menu--subnav a:hover {
     background-color: inherit;
-    border-bottom: 3px solid #ccc;
+    border-bottom: 2px solid #ccc;
+    color: #000; }
+  .org-sci .uw-horizontal-nav .menu--horizontal li .menu--subnav a.active {
+    background-color: inherit;
+    border-bottom: 2px solid #000;
     color: #000; }
+    .org-sci .uw-horizontal-nav .menu--horizontal li .menu--subnav a.active:hover {
+      background-color: inherit;
+      border-bottom: 2px solid #ccc;
+      color: #000; }
 
 .org-school .uw-horizontal-nav .uw-site-home__link {
   background-color: #80001f; }
@@ -4697,9 +4697,8 @@ fieldset,
       fill: #80001f; }
 
 .org-school .uw-horizontal-nav .menu--horizontal > .is-active-trail {
-  border-top: 4px solid #80001f; }
-  .org-school .uw-horizontal-nav .menu--horizontal > .is-active-trail.has-submenu::after {
-    border-top: 4px solid #80001f; }
+  background-color: #ccc;
+  color: #000; }
 
 .org-school .uw-horizontal-nav .menu--horizontal li.submenu-active > a {
   background-color: #ccc;
@@ -4707,46 +4706,46 @@ fieldset,
 
 .org-school .uw-horizontal-nav .menu--horizontal li > a {
   color: #000; }
-  .org-school .uw-horizontal-nav .menu--horizontal li > a:focus, .org-school .uw-horizontal-nav .menu--horizontal li > a.is-active-trail {
-    background-color: #ccc;
-    color: #000; }
-  .org-school .uw-horizontal-nav .menu--horizontal li > a:active {
+  .org-school .uw-horizontal-nav .menu--horizontal li > a:focus, .org-school .uw-horizontal-nav .menu--horizontal li > a.active {
     background-color: #ccc;
     color: #000; }
   .org-school .uw-horizontal-nav .menu--horizontal li > a:hover {
     background-color: #fff;
     color: #000; }
 
+.org-school .uw-horizontal-nav .menu--horizontal li .menu--subnav .is-active-trail > a {
+  border-bottom: 2px solid #80001f; }
+
 .org-school .uw-horizontal-nav .menu--horizontal li .menu--subnav a {
   background-color: transparent;
-  border-bottom: 3px solid transparent;
+  border-bottom: 2px solid transparent;
   text-decoration: none; }
   .org-school .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent {
     color: #80001f; }
-    .org-school .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent:focus, .org-school .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent.is-active-trail {
-      background-color: inherit;
-      border-bottom: 3px solid #80001f;
-      color: #80001f; }
-    .org-school .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent:active {
+    .org-school .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent:focus, .org-school .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent.active {
       background-color: inherit;
-      border-bottom: 3px solid #80001f;
+      border-bottom: 2px solid #80001f;
       color: #80001f; }
     .org-school .uw-horizontal-nav .menu--horizontal li .menu--subnav a.menu--link-parent:hover {
       background-color: inherit;
-      border-bottom: 3px solid #80001f;
+      border-bottom: 2px solid #80001f;
       color: #80001f; }
-  .org-school .uw-horizontal-nav .menu--horizontal li .menu--subnav a:focus, .org-school .uw-horizontal-nav .menu--horizontal li .menu--subnav a.is-active-trail {
+  .org-school .uw-horizontal-nav .menu--horizontal li .menu--subnav a:focus {
     background-color: inherit;
-    border-bottom: 3px solid #80001f;
-    color: #80001f; }
-  .org-school .uw-horizontal-nav .menu--horizontal li .menu--subnav a:active {
-    background-color: inherit;
-    border-bottom: 3px solid #80001f;
+    border-bottom: 2px solid #80001f;
     color: #80001f; }
   .org-school .uw-horizontal-nav .menu--horizontal li .menu--subnav a:hover {
     background-color: inherit;
-    border-bottom: 3px solid #ccc;
+    border-bottom: 2px solid #ccc;
+    color: #000; }
+  .org-school .uw-horizontal-nav .menu--horizontal li .menu--subnav a.active {
+    background-color: inherit;
+    border-bottom: 2px solid #000;
     color: #000; }
+    .org-school .uw-horizontal-nav .menu--horizontal li .menu--subnav a.active:hover {
+      background-color: inherit;
+      border-bottom: 2px solid #ccc;
+      color: #000; }
 
 .uw-horizontal-nav {
   max-width: 100%;
@@ -4794,6 +4793,8 @@ fieldset,
     @media (min-width: 48.06rem) {
       .uw-horizontal-nav--menu {
         grid-column: 2/3; } }
+    .uw-horizontal-nav--menu .menu--link {
+      position: relative; }
     .uw-horizontal-nav--menu .menu .menu--item a {
       cursor: pointer;
       outline: none;
@@ -4915,28 +4916,28 @@ fieldset,
             top: 4px; }
         .uw-horizontal-nav--menu .menu .submenu-active .menu--subnav .menu--item a {
           font-family: Typ1451-Bold,-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Oxygen-Sans", Ubuntu, Cantarell, "Fira Sans", Droid Sans, sans-serif;
+          font-weight: 400;
           padding: 4px;
           padding-left: 0; }
         .uw-horizontal-nav--menu .menu .submenu-active .menu--subnav .menu--item .menu--item {
-          font-family: Typ1451-Medium,-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Oxygen-Sans", Ubuntu, Cantarell, "Fira Sans", Droid Sans, sans-serif;
+          font-family: Typ1451-Regular,-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Oxygen-Sans", Ubuntu, Cantarell, "Fira Sans", Droid Sans, sans-serif;
           font-weight: 200;
           margin-top: inherit;
           max-width: inherit;
           padding-left: 16px; }
           .uw-horizontal-nav--menu .menu .submenu-active .menu--subnav .menu--item .menu--item a {
-            font-family: Typ1451-Medium,-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Oxygen-Sans", Ubuntu, Cantarell, "Fira Sans", Droid Sans, sans-serif;
-            font-weight: 400; }
+            font-family: Typ1451-Regular,-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Oxygen-Sans", Ubuntu, Cantarell, "Fira Sans", Droid Sans, sans-serif; }
           .uw-horizontal-nav--menu .menu .submenu-active .menu--subnav .menu--item .menu--item .menu--item {
             margin-top: inherit;
             padding-left: 16px; }
             .uw-horizontal-nav--menu .menu .submenu-active .menu--subnav .menu--item .menu--item .menu--item a {
-              font-family: Typ1451-Medium,-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Oxygen-Sans", Ubuntu, Cantarell, "Fira Sans", Droid Sans, sans-serif;
+              font-family: Typ1451-Regular,-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Oxygen-Sans", Ubuntu, Cantarell, "Fira Sans", Droid Sans, sans-serif;
               font-weight: 200; }
             .uw-horizontal-nav--menu .menu .submenu-active .menu--subnav .menu--item .menu--item .menu--item .menu--item {
               margin-top: inherit;
               padding-left: 16px; }
               .uw-horizontal-nav--menu .menu .submenu-active .menu--subnav .menu--item .menu--item .menu--item .menu--item a {
-                font-family: Typ1451-Medium,-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Oxygen-Sans", Ubuntu, Cantarell, "Fira Sans", Droid Sans, sans-serif;
+                font-family: Typ1451-Regular,-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Oxygen-Sans", Ubuntu, Cantarell, "Fira Sans", Droid Sans, sans-serif;
                 font-weight: 200; }
 
 .uw-horizontal-nav--secondary {
diff --git a/source/_patterns/03-layouts/header/header.yml b/source/_patterns/03-layouts/header/header.yml
index b487ae5581e2ab0f723f4eaff21e84200bee8613..2a088aae172f97b618c306add42bc2eafd6d6930 100644
--- a/source/_patterns/03-layouts/header/header.yml
+++ b/source/_patterns/03-layouts/header/header.yml
@@ -76,7 +76,7 @@ nav_items:
       options:
         attributes:
           class: ''
-    active_trail: false
+    active_trail: true
     submenu:
       - text: 'Research areas'
         url: '#'
@@ -91,7 +91,7 @@ nav_items:
           options:
             attributes:
               class: ''
-        active_trail: false
+        active_trail: true
         submenu:
           - text: 'Clinical'
             url: '#'
@@ -127,7 +127,7 @@ nav_items:
               options:
                 attributtes:
                   class: ''
-            active-trial: false
+            active-trial: true
             submenu:
               - text: 'Academic Program for Graduate Study in Industrial-Organizational Psychology'
                 url: '#'
@@ -135,7 +135,8 @@ nav_items:
                   options:
                     attributes:
                       class: ''
-                active_trail: false
+                active_trail: true
+                active: true
           - text: 'Social Psychology'
             url: '#'
             original_link:
@@ -280,7 +281,7 @@ secondary_items:
       options:
         attributes:
           class: ''
-    active_trail: false
+    active_trail: true
     submenu:
       - text: 'Degree Options and Specializations'
         url: '#'
@@ -310,7 +311,7 @@ secondary_items:
           options:
             attributes:
               class: ''
-        active_trail: false
+        active_trail: true
         submenu:
           - text: 'Future course offerings'
             url: '#'
@@ -332,7 +333,7 @@ secondary_items:
               options:
                 attributes:
                   class: ''
-            active_trail: false
+            active_trail: true
             submenu:
               - text: 'Conference opportunities '
                 url: '#'
@@ -340,7 +341,7 @@ secondary_items:
                   options:
                     attributes:
                       class: ''
-                active_trail: false
+                active_trail: true
                 submenu:
                   - text: 'Annual Ontario Psychology Undergraduate Thesis Conference'
                     url: '#'
@@ -348,7 +349,8 @@ secondary_items:
                       options:
                         attributes:
                           class: ''
-                    active_trail: false
+                    active_trail: true
+                    active: true
               - text: 'Publishing opportunities'
                 url: '#'
                 original_link:
diff --git a/source/_patterns/03-layouts/site-container/site-container.yml b/source/_patterns/03-layouts/site-container/site-container.yml
index 876e593e21b3df12e766bcad7b2fdd9dfdb91180..d82b757ad473cfbea3c3e45b33397a5255fd52bc 100644
--- a/source/_patterns/03-layouts/site-container/site-container.yml
+++ b/source/_patterns/03-layouts/site-container/site-container.yml
@@ -157,7 +157,7 @@ nav_items:
       options:
         attributes:
           class: ''
-    active_trail: false
+    active_trail: true
     submenu:
       - text: 'Research areas'
         url: '#'
@@ -172,7 +172,7 @@ nav_items:
           options:
             attributes:
               class: ''
-        active_trail: false
+        active_trail: true
         submenu:
           - text: 'Clinical'
             url: '#'
@@ -208,7 +208,7 @@ nav_items:
               options:
                 attributtes:
                   class: ''
-            active-trial: false
+            active_trail: true
             submenu:
               - text: 'Academic Program for Graduate Study in Industrial-Organizational Psychology'
                 url: '#'
@@ -216,7 +216,8 @@ nav_items:
                   options:
                     attributes:
                       class: ''
-                active_trail: false
+                active_trail: true
+                active: true
           - text: 'Social Psychology'
             url: '#'
             original_link:
@@ -361,7 +362,7 @@ secondary_items:
       options:
         attributes:
           class: ''
-    active_trail: false
+    active_trail: true
     submenu:
       - text: 'Degree Options and Specializations'
         url: '#'
@@ -391,7 +392,7 @@ secondary_items:
           options:
             attributes:
               class: ''
-        active_trail: false
+        active_trail: true
         submenu:
           - text: 'Future course offerings'
             url: '#'
@@ -413,7 +414,7 @@ secondary_items:
               options:
                 attributes:
                   class: ''
-            active_trail: false
+            active_trail: true
             submenu:
               - text: 'Conference opportunities '
                 url: '#'
@@ -421,7 +422,7 @@ secondary_items:
                   options:
                     attributes:
                       class: ''
-                active_trail: false
+                active_trail: true
                 submenu:
                   - text: 'Annual Ontario Psychology Undergraduate Thesis Conference'
                     url: '#'
@@ -429,7 +430,8 @@ secondary_items:
                       options:
                         attributes:
                           class: ''
-                    active_trail: false
+                    active_trail: true
+                    active: true
               - text: 'Publishing opportunities'
                 url: '#'
                 original_link:
diff --git a/source/_patterns/04-components/menu/menu--horizontal/_menu--horizontal.scss b/source/_patterns/04-components/menu/menu--horizontal/_menu--horizontal.scss
index 20145517da85ec58be27905fd01d9658280229bc..6fca1d26ed30c7d811fe69eff3195561247b28de 100644
--- a/source/_patterns/04-components/menu/menu--horizontal/_menu--horizontal.scss
+++ b/source/_patterns/04-components/menu/menu--horizontal/_menu--horizontal.scss
@@ -1,6 +1,6 @@
 $menu-horizontal-bg: gesso-grayscale(gray-2);
 $menu-horizontal-bar-font: gesso-font-family(book);
-$menu-horizontal-sub-font: gesso-font-family(systemmedium);
+$menu-horizontal-sub-font: gesso-font-family(system);
 $menu-horizontal-sub-font-bold: gesso-font-family(systembold);
 $menu-horizontal-bar-font-size: rem(gesso-font-size(-2));
 $menu-horizontal-sub-font-size: rem(gesso-font-size(-2));
@@ -31,7 +31,10 @@ $faculties: 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env', 'org-mat'
         }
 
         .menu--horizontal {
-
+          > .is-active-trail {
+            background-color:  gesso-grayscale(gray-3);
+            color: gesso-brand(org-default,uw-black,lvl4);
+          }
           li {
             &.submenu-active {
               > a {
@@ -43,12 +46,11 @@ $faculties: 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env', 'org-mat'
 
               color: gesso-brand(org-default,uw-black,lvl4);
 
-              &:focus,
-              &.is-active-trail{
+              &:focus{
                 background-color:  gesso-grayscale(gray-3);
                 color: gesso-brand(org-default,uw-black,lvl4);
               }
-              &:active{
+              &.active{
                 background-color:  gesso-grayscale(gray-3);
                 color: gesso-brand(org-default,uw-black,lvl4);
               }
@@ -59,26 +61,30 @@ $faculties: 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env', 'org-mat'
             }
 
             .menu--subnav{
+              .is-active-trail {
+                > a{
+                  border-bottom: 2px solid gesso-brand(org-default,uw-black,lvl4);
+                }
+
+              }
               a{
                 background-color:transparent;
-                border-bottom:3px solid transparent;
+                border-bottom:2px solid transparent;
                 text-decoration:none;
-
-                &:focus,
-                &.is-active-trail{
+                &.active{
                   background-color:inherit;
-                  border-bottom:3px solid  gesso-grayscale(gray-3);
-                  color: gesso-brand(org-default,uw-black,lvl4);
-                }
-                &:active{
-                  background-color:inherit;
-                  border-bottom:3px solid  gesso-grayscale(gray-3);
-                }
-                &:hover{
-                  background-color:inherit;
-                  border-bottom:3px solid  gesso-grayscale(gray-3);
+                  border-bottom:2px solid  gesso-brand(org-default,uw-black,lvl4);
                   color: gesso-brand(org-default,uw-black,lvl4);
+                  &::after{
+                    display:none;
+                  }
+                  &:hover{
+                    background-color:inherit;
+                    border-bottom:2px solid  gesso-grayscale(gray-3);
+                    color: gesso-brand(org-default,uw-black,lvl4);
+                  }
                 }
+
               }
             }
           }
@@ -110,13 +116,9 @@ $faculties: 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env', 'org-mat'
 
         .menu--horizontal {
           > .is-active-trail {
-            border-top: 4px solid gesso-brand($faculty, lvl4);
-
-            &.has-submenu {
-              &::after {
-                border-top: 4px solid gesso-brand($faculty, lvl4);
-              }
-            }
+            //border-bottom: 2px solid gesso-brand($faculty, lvl4);
+            background-color:  gesso-grayscale(gray-3);
+            color: gesso-brand(org-default,uw-black,lvl4);
           }
           li {
             &.submenu-active {
@@ -130,11 +132,7 @@ $faculties: 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env', 'org-mat'
               color: gesso-brand(org-default,uw-black,lvl4);
 
               &:focus,
-              &.is-active-trail{
-                background-color:  gesso-grayscale(gray-3);
-                color: gesso-brand(org-default,uw-black,lvl4);
-              }
-              &:active{
+              &.active{
                 background-color:  gesso-grayscale(gray-3);
                 color: gesso-brand(org-default,uw-black,lvl4);
               }
@@ -144,44 +142,50 @@ $faculties: 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env', 'org-mat'
               }
             }
             .menu--subnav{
+
+              .is-active-trail {
+                > a{
+                  border-bottom: 2px solid gesso-brand($faculty, lvl4);
+                }
+
+              }
               a{
                background-color:transparent;
-               border-bottom:3px solid transparent;
+               border-bottom:2px solid transparent;
                text-decoration:none;
                 &.menu--link-parent{
                   color: gesso-brand($faculty, lvl4);
                   &:focus,
-                  &.is-active-trail{
-                    background-color:inherit;
-                    border-bottom:3px solid gesso-brand($faculty, lvl4);
-                    color: gesso-brand($faculty, lvl4);
-                  }
-                  &:active{
+                  &.active{
                     background-color:inherit;
-                    border-bottom:3px solid gesso-brand($faculty, lvl4);
+                    border-bottom:2px solid gesso-brand($faculty, lvl4);
                     color: gesso-brand($faculty, lvl4);
                   }
                   &:hover{
                     background-color:inherit;
-                    border-bottom:3px solid gesso-brand($faculty, lvl4);
+                    border-bottom:2px solid gesso-brand($faculty, lvl4);
                     color: gesso-brand($faculty, lvl4);
                   }
                 }
-                &:focus,
-                &.is-active-trail{
-                  background-color:inherit;
-                  border-bottom:3px solid gesso-brand($faculty, lvl4);
+                &:focus {
+                  background-color: inherit;
+                  border-bottom: 2px solid gesso-brand($faculty, lvl4);
                   color: gesso-brand($faculty, lvl4);
                 }
-                &:active{
+                &:hover{
                   background-color:inherit;
-                  border-bottom:3px solid gesso-brand($faculty, lvl4);
-                  color: gesso-brand($faculty, lvl4);
+                  border-bottom:2px solid  gesso-grayscale(gray-3);
+                  color: gesso-brand(org-default,uw-black,lvl4);
                 }
-                &:hover{
+                &.active{
                   background-color:inherit;
-                  border-bottom:3px solid  gesso-grayscale(gray-3);
+                  border-bottom:2px solid  gesso-brand(org-default,uw-black,lvl4);
                   color: gesso-brand(org-default,uw-black,lvl4);
+                  &:hover{
+                    background-color:inherit;
+                    border-bottom:2px solid  gesso-grayscale(gray-3);
+                    color: gesso-brand(org-default,uw-black,lvl4);
+                  }
                 }
               }
             }
@@ -235,6 +239,10 @@ $faculties: 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env', 'org-mat'
     }
 
     .menu {
+      &--link{
+        position:relative;
+
+      }
       // ALL Menus ul>
 
       .menu--item{
@@ -348,12 +356,11 @@ $faculties: 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env', 'org-mat'
           flex:0 1;
           height:auto;
           max-width: 50%;
+          padding-left: gesso-spacing(sm);
           @include large {
           max-width: 33%;
             padding-left: gesso-spacing(sm);
           }
-          padding-left: gesso-spacing(sm);
-
           &:first-of-type{
             .menu--link-parent {
               display:block;
@@ -376,11 +383,10 @@ $faculties: 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env', 'org-mat'
           }
           a{
             font-family:$menu-horizontal-sub-font-bold;
+            font-weight:400;
             padding:gesso-spacing(xxs);
             padding-left:0;
           }
-
-
           .menu--item{
             font-family:$menu-horizontal-sub-font;
             font-weight:200;
@@ -389,7 +395,7 @@ $faculties: 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env', 'org-mat'
             padding-left: gesso-spacing(sm);
             a{
               font-family:$menu-horizontal-sub-font;
-              font-weight:400;
+
             }
             .menu--item{
 
diff --git a/source/_patterns/04-components/menu/menu--main/menu--main.yml b/source/_patterns/04-components/menu/menu--main/menu--main.yml
index 5ae55654e42820e9a8aedcba4a0d099f48471cf6..0883c070a658248881a6f955d9f06b9a947c7177 100644
--- a/source/_patterns/04-components/menu/menu--main/menu--main.yml
+++ b/source/_patterns/04-components/menu/menu--main/menu--main.yml
@@ -30,7 +30,7 @@ items:
       options:
         attributes:
           class: ''
-    active_trail: false
+    active_trail: true
     submenu:
       - text: 'Research areas'
         url: '#'
@@ -81,7 +81,7 @@ items:
               options:
                 attributtes:
                   class: ''
-            active-trial: false
+            active-trial: true
             submenu:
               - text: 'Academic Program for Graduate Study in Industrial-Organizational Psychology'
                 url: '#'
@@ -89,7 +89,8 @@ items:
                   options:
                     attributes:
                       class: ''
-                active_trail: false
+                active_trail: true
+                active: true
           - text: 'Social Psychology'
             url: '#'
             original_link:
diff --git a/source/_patterns/04-components/menu/menu--secondary/menu--secondary.yml b/source/_patterns/04-components/menu/menu--secondary/menu--secondary.yml
index 67563071f09cab08458050763c4b47cf914c9d55..49e31a1dcdbe25b62e0744d7795af5a2dba50906 100644
--- a/source/_patterns/04-components/menu/menu--secondary/menu--secondary.yml
+++ b/source/_patterns/04-components/menu/menu--secondary/menu--secondary.yml
@@ -9,7 +9,7 @@ items:
       options:
         attributes:
           class: ''
-    active_trail: false
+    active_trail: true
     submenu:
       - text: 'Degree Options and Specializations'
         url: '#'
@@ -39,7 +39,7 @@ items:
           options:
             attributes:
               class: ''
-        active_trail: false
+        active_trail: true
         submenu:
           - text: 'Future course offerings'
             url: '#'
@@ -61,7 +61,7 @@ items:
               options:
                 attributes:
                   class: ''
-            active_trail: false
+            active_trail: true
             submenu:
               - text: 'Conference opportunities '
                 url: '#'
@@ -69,7 +69,7 @@ items:
                   options:
                     attributes:
                       class: ''
-                active_trail: false
+                active_trail: true
                 submenu:
                   - text: 'Annual Ontario Psychology Undergraduate Thesis Conference'
                     url: '#'
@@ -77,7 +77,8 @@ items:
                       options:
                         attributes:
                           class: ''
-                    active_trail: false
+                    active_trail: true
+                    active: true
               - text: 'Publishing opportunities'
                 url: '#'
                 original_link:
diff --git a/source/_patterns/04-components/menu/menu.twig b/source/_patterns/04-components/menu/menu.twig
index 3660e9e36c178c19723175563a500be10ca6ba7b..3a263e71db533afbba6fb37f8bea778871c69e2b 100644
--- a/source/_patterns/04-components/menu/menu.twig
+++ b/source/_patterns/04-components/menu/menu.twig
@@ -34,7 +34,10 @@
       {#{% endif %}#}
       {% if item.active_trail %}
         {% set item_classes = item_classes|merge(['is-active-trail']) %}
-        {% set link_classes = link_classes|merge(['is-active-trail']) %}
+
+      {% endif %}
+      {% if item.active %}
+        {% set link_classes = link_classes|merge(['active']) %}
       {% endif %}
       {% if item.is_collapsed %}
         {% set item_classes = item_classes|merge(['is-collapsed']) %}
@@ -65,7 +68,7 @@
           {% set item_classes = item_classes|merge(['has-submenu']) %}
           {% set link_classes = ['menu--link__sub'] %}
         {% elseif menu_level <= 2 %}
-          {% set menu_parent_show = true %}
+          {% set menu_parent_hide = true %}
           {% set item_classes = item_classes|merge(['has-children']) %}
         {% endif %}
       {% endif %}
@@ -82,7 +85,7 @@
 
 
 
-      {% if menu_level == 1 and parent and not menu_parent_show  %}
+      {% if menu_level == 1 and parent and not menu_parent_hide  %}
 
         <li {{ add_attributes(additional_item_attributes) }}>
 
@@ -105,8 +108,7 @@
             aria-haspopup="true"
             role="button"
           {% else %}
-            href="{{ item.url }}"
-            class="menu--link__only"
+           href="{{ item.url }}"
           {% endif %}
           {{ add_attributes(link_attributes) }}
         >