diff --git a/_includes/breadcrumb.html b/_includes/breadcrumb.html
index 5ea8871..1de32c5 100644
--- a/_includes/breadcrumb.html
+++ b/_includes/breadcrumb.html
@@ -7,12 +7,11 @@
 <nav class="breadcrumbs" role="menubar" aria-label="breadcrumbs">
  <li><a href="{{ site.url }}">{{ site.data.language.breadcrumb_start }}</a></li>
  {% assign crumbs = page.url | split: '/' %}
- {% assign crumbs_total = crumbs | size | minus: 1 %}
    {% for crumb in crumbs offset: 1 %}
-    {% if forloop.index == crumbs_total %}
+    {% if forloop.last %}
         <li class="current">{{ page.title }}</li>
     {% else %}
         <li><a href="{{ site.url }}{% assign crumb_limit = forloop.index | plus: 1 %}{% for crumb in crumbs limit: crumb_limit %}{{ crumb | append: '/' }}{% endfor %}">{{ crumb | replace:'-',' ' }}</a>
     {% endif %}
   {% endfor %}
-</nav>
\ No newline at end of file
+</nav>
diff --git a/_includes/navigation.html b/_includes/navigation.html
index 170dc59..0888ea9 100644
--- a/_includes/navigation.html
+++ b/_includes/navigation.html
@@ -24,7 +24,9 @@
 
               {% if link.url contains 'http' %}
                 {% assign domain = '' %}
-                {% else %}
+              {% elsif link.url == '#' %}
+                {% assign domain = '' %}
+              {% else %}
                 {% assign domain = site.url %}
               {% endif %}
 
@@ -76,7 +78,9 @@
 
               {% if link.url contains 'http' %}
                 {% assign domain = '' %}
-                {% else %}
+              {% elsif link.url == '#' %}
+                {% assign domain = '' %}
+              {% else %}
                 {% assign domain = site.url %}
               {% endif %}