diff --git a/classes/navigation.php b/classes/navigation.php
index 7337079..ecb1fa4 100644
--- a/classes/navigation.php
+++ b/classes/navigation.php
@@ -194,6 +194,7 @@ class Navigation extends Template {
             Routes::getUri(false),
             Routes::getAddress() . $selectString,
             Routes::getAddress() . $explodedUrl[0],
+            '/' . $selectString,
             $selectString,
             $explodedUrl[0],
             '/' . $explodedUrl[0],
@@ -204,23 +205,23 @@ class Navigation extends Template {
         ];
 
         foreach ( $variations as $url ) {
-            $regex = "#(.*)<li(?: class=\")?(.*?)(?:\")?>\s*?<a href=\"$url\"(.*)#is";
+            $regex = "#(.*)<li(?: class=\")?(.*?)(?:\")?>\s*?<a href=\"$url\"(?: class=\")?(.*?)(?:\")>?#is";
             if ( preg_match( $regex, $view ) ) {
                 $regSelect = $url;
                 break;
             }
         }
-        if ( !empty( $regSelect ) ) {
-            $regSelect = preg_quote($regSelect);
-            $regActive = "$1<li class=\"$2 active\"><a href=\"$regSelect\"$3";
-
+        if ( ! empty( $regSelect ) ) {
+            $regSelect = preg_quote( $regSelect );
+            $regActive = "$1<li class=\"$2\"><a href=\"$regSelect\" class=\"$3 active\">";
             $view = preg_replace( $regex, $regActive, $view );
-            $parentRegex = "#(.*)class=\"collapse(.*?)<li class=\"submenu active\">\s*<a href=\"$regSelect\"(.*)#is";
 
+            $parentRegex = "#(.*)class=\"(.*?)collapse(.*?)<li class=\"nav-item\">\s*<a href=\"$regSelect\" class=\"submenu (.*?)\">#is";
             if ( preg_match( $parentRegex, $view ) ) {
-                $expandRegex = "$1 class=\"expand$2<li class=\"submenu active\"><a href=\"$regSelect\"$3";
+                $expandRegex = "$1 class=\"$2collapse show$3<li class=\"nav-item\"><a href=\"$regSelect\" class=\"submenu active $4\">";
                 $view = preg_replace( $parentRegex, $expandRegex, $view );
             }
+
             if ( !empty( $addToContent ) ) {
                 self::$content .= $view;
                 return true;