diff --git a/templates/Includes/NavItem_link.ss b/templates/Includes/NavItem_link.ss
index ff29967..c3e1900 100755
--- a/templates/Includes/NavItem_link.ss
+++ b/templates/Includes/NavItem_link.ss
@@ -1,7 +1,21 @@
 <a
-    class="nav-link graphql-page $ExtraClass <% if $LinkClass %>{$LinkClass}<% else %>nav-link<% end_if %><% if $RedirectionType = 'External' || $ExternalURL || $OpenInNewWindow %> external<% end_if %><% if $isCurrent || $isSection %> active <% end_if %><% if $isSection %> section<% end_if %>"
     href="{$Link}"
-    <% if $RedirectionType = 'External' || $OpenInNewWindow %>rel="noreferrer" target="_blank"<% end_if %>
+    class="
+        nav-link
+        graphql-page
+        $ExtraClass
+        {$LinkClass}
+        <% if $RedirectionType = 'External' || $ExternalURL || $OpenInNewWindow %>
+            external
+        <% end_if %>
+        <% if $isCurrent || $isSection %>active <% end_if %>
+        <% if $isSection %>section<% end_if %>
+    "
+    <% if $RedirectionType = 'External' || $OpenInNewWindow %>
+        rel="noreferrer"
+        target="_blank"
+    <% end_if %>
+
     data-text="{$MenuTitle.XML}"
 >
 	<% if $BlockIcon %>