diff --git a/templates/base.html b/templates/base.html
index 9e8acec..49af294 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -28,7 +28,7 @@
                     {% set top = get_section(path="_index.md") %}
                     {% for p in top.subsections %}
                         {% set sub = get_section(path=p) %}
-                        <li><a href="{{ sub.permalink }}">{{ sub.title }}</a></li>
+                        <li><a href="{{ sub.permalink | replace(from=config.base_url, to='') | safe }}">{{ sub.title }}</a></li>
                     {% endfor %}
                     </ul>
                 </div>
diff --git a/templates/macros/image.html b/templates/macros/image.html
index b25fb63..a28b042 100644
--- a/templates/macros/image.html
+++ b/templates/macros/image.html
@@ -5,7 +5,7 @@
   {%- set source_path = "static/images/" ~ src -%}
   {%- set resized = resize_image(path=source_path, width=width, op="fit_width", quality=85) -%}
   <img
-    src="{{ resized.url }}"
+    src="{{ resized.url | safe }}"
     width="{{ resized.width }}"
     height="{{ resized.height }}"
     alt="{{ alt }}"
diff --git a/templates/partials/navbar.html b/templates/partials/navbar.html
index 036a6c8..a1cfdda 100644
--- a/templates/partials/navbar.html
+++ b/templates/partials/navbar.html
@@ -35,7 +35,7 @@
                     <ul class="col-sm-{{ col_width | round }}">
                       <li class="dropdown-header">{{ child.title }}</li>
                       {%- for cpage in child.pages -%}
-                        <li><a href="{{ cpage.permalink }}">{{ cpage.title }}</a></li>
+                        <li><a href="{{ cpage.permalink | replace(from=config.base_url, to='') | safe }}">{{ cpage.title }}</a></li>
                       {%- endfor -%}
                     </ul>
                   </li>
@@ -44,7 +44,7 @@
             </li>
           {%- else -%}
             <li class="{% if current_url and current_url is starting_with(sub.permalink) %}active{% endif %}">
-              <a href="{{ sub.permalink }}">{{ sub.title }}</a>
+              <a href="{{ sub.permalink | replace(from=config.base_url, to='') | safe }}">{{ sub.title }}</a>
             </li>
           {%- endif -%}
         {%- endfor -%}