diff --git a/theme/static/css/custom.css b/theme/static/css/custom.css
index 2aa5a12..6a182ab 100644
--- a/theme/static/css/custom.css
+++ b/theme/static/css/custom.css
@@ -194,6 +194,10 @@ a {
     li:last-child {
       padding-right: 0;
     }
+
+    li[aria-current=page] a {
+      text-decoration: underline;
+    }
   }
 
   a {
diff --git a/theme/templates/includes/navbar.html b/theme/templates/includes/navbar.html
index f87b3a7..fadfab8 100644
--- a/theme/templates/includes/navbar.html
+++ b/theme/templates/includes/navbar.html
@@ -8,7 +8,8 @@
   </label>
   <ul id="main-menu-items" role="list">
     {% for title, link in MENUITEMS %}
-    {% if link == url %}
+    {% if output_file[-10:] == "index.html" and "/" + output_file[:-10] == link %} {# 10 characters is the length of
+    "index.html" #}
     <li aria-current="page" role="listitem">
       {% else %}
     <li role="listitem">
@@ -23,4 +24,5 @@
       </label>
     </li>
   </ul>
-</nav>
\ No newline at end of file
+</nav>
+{# {% debug %} #}
\ No newline at end of file