diff --git a/_data/for_business.yml b/_data/for_business.yml
index 80904856..414d5fdf 100644
--- a/_data/for_business.yml
+++ b/_data/for_business.yml
@@ -1,6 +1,6 @@
 ref: business
 link:
-  internal: use/business
+  internal: use/business.md
 title: For Business
 text: |
   lorem ipsum text
diff --git a/_data/for_edu.yml b/_data/for_edu.yml
index 2c12e973..6a0f690b 100644
--- a/_data/for_edu.yml
+++ b/_data/for_edu.yml
@@ -1,6 +1,6 @@
 ref: edu
 link:
-  internal: use/education
+  internal: use/education.md
 title: For Education
 text: |
   Electronic Labs are creative places. Whether your institution works with K12 or post-grads - organisation and tooling is challenging. Let InvenTree help you calm the storm!
diff --git a/_data/for_maker.yml b/_data/for_maker.yml
index 0d73e7c7..dee91c1d 100644
--- a/_data/for_maker.yml
+++ b/_data/for_maker.yml
@@ -1,6 +1,6 @@
 ref: maker
 link:
-  internal: use/maker
+  internal: use/maker.md
 title: For Maker
 text: |
   lorem ipsum text
diff --git a/_data/functions/general.yml b/_data/functions/general.yml
index c091c3ab..c1422b50 100644
--- a/_data/functions/general.yml
+++ b/_data/functions/general.yml
@@ -1,6 +1,6 @@
 title: InvenTree builds it vast functions on top of a few core workflows
 link:
-  internal: functions
+  internal: functions/index.md
 text:
 functions:
   - title: Organize Parts
diff --git a/_data/general/footer.yml b/_data/general/footer.yml
index d057460f..a7ca2251 100644
--- a/_data/general/footer.yml
+++ b/_data/general/footer.yml
@@ -42,12 +42,12 @@
   - name: Home
     home: true
   - name: For Maker
-    internal: maker
+    internal: use/maker.md
   - name: For Business
-    internal: business
+    internal: use/business.md
   - name: For Education
-    internal: education
+    internal: use/education.md
   - name: About
-    internal: about
+    internal: about/index.md
   - name: Blog
-    internal: blog
+    internal: blog/index.html
diff --git a/_includes/fnc/link.html b/_includes/fnc/link.html
index eda5ec42..ae3fe345 100644
--- a/_includes/fnc/link.html
+++ b/_includes/fnc/link.html
@@ -5,7 +5,7 @@
 {% if include.item.site %}
     {{ site[include.item.site] }}
 {% elsif include.item.internal %}
-    {{ include.item.internal | relativurl }}
+    {% link {{ include.item.internal }} %}
 {% elsif include.item.link %}
     {{ include.item.link | include fnc/link.html }}
 {% elsif include.item.home %}
diff --git a/blog.html b/blog/index.html
similarity index 100%
rename from blog.html
rename to blog/index.html
diff --git a/functions.md b/functions/index.md
similarity index 100%
rename from functions.md
rename to functions/index.md