diff --git a/_config.yml b/_config.yml
index 86d21cee..4e3f2505 100644
--- a/_config.yml
+++ b/_config.yml
@@ -3,7 +3,10 @@ title: InvenTree
 tagline: Intuitive Inventory Management
 demo-link: https://inventree.readthedocs.io/en/latest/demo/
 doc-link: https://inventree.readthedocs.io/en/latest/
-plugin-link: https://repo.invenhost.com/
+blog-link:
+  internal: blog.html
+plugin-link: 
+  internal: plugins.html
 
 description: >-
   InvenTree is an open-source inventory management system which provides intuitive parts management and stock control.
@@ -20,6 +23,8 @@ collections:
     output: true
     custom_permalink_placeholders: ["publisher"]
     #permalink: "/:publisher/:title"
+  posts:
+    permalink: /blog/:year/:month/:day/:title
 
 defaults:
   - scope:
@@ -40,7 +45,7 @@ defaults:
   - scope:
       path: ""
     values:
-      layout: "default"
+      layout: "content"
 
 plugins:
   - jekyll-seo-tag
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..63c8bddf 100644
--- a/_data/for_edu.yml
+++ b/_data/for_edu.yml
@@ -1,9 +1,9 @@
 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!
+  Electronic Labs are creative places. Whether your institution works with K12 or post-grads - organisation and tooling is challenging. Let InvenTree at least do the invetory reliably for you!
 
 features:
   - title: Open Source - Open Knowledge
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..fd6f548f 100644
--- a/_data/general/footer.yml
+++ b/_data/general/footer.yml
@@ -5,7 +5,7 @@
   - name: Demo
     site: demo-link
   - name: Plugins
-    site: plugin-link
+    internal: plugins.html
 
 - title: Contribute
   cats:
@@ -27,7 +27,7 @@
   - name: API
     link: https://inventree.readthedocs.io/en/latest/extend/python/
   - name: Plugins
-    site: plugin-link
+    internal: plugins.html
   - name: KiCad
     link: https://github.com/sparkmicro/Ki-nTree/
   - name: Fusion360
@@ -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.html
diff --git a/_includes/base/footer.html b/_includes/base/footer.html
index 1cad2669..8e7a8c83 100644
--- a/_includes/base/footer.html
+++ b/_includes/base/footer.html
@@ -1,5 +1,5 @@
 <footer class="cm-gray-2 body-font">
-    <div class="container px-5 py-8 mx-auto flex md:items-center lg:items-start md:flex-row md:flex-nowrap flex-wrap flex-col">
+    <div class="container px-5 py-8 mx-auto flex md:flex-row md:flex-nowrap flex-wrap flex-col">
       <div class="w-64 flex-shrink-0 md:mx-0 mx-auto text-center md:text-left">
         <a class="flex title-font font-medium items-center md:justify-start justify-center cm-gray-1">
           <img src="{{ '/assets/logo.png' | relative_url }}" alt="logo" height="32" width="32" class="h-8">
@@ -30,7 +30,7 @@
     <div class="bg-gray-100">
       <div class="container mx-auto py-4 px-5 flex flex-wrap flex-col sm:flex-row">
         <p class="cm-gray-3 text-sm text-center sm:text-left">© 2021 {{ site.title }} — made with &hearts; by
-          <a href="https://github.com/matmair" rel="noopener noreferrer" class="cm-gray-2 ml-1" target="_blank">@matmair</a>
+          <a href="https://github.com/matmair" rel="noopener" class="cm-gray-2 ml-1" target="_blank">@matmair</a>
         </p>
         <span class="inline-flex sm:ml-auto sm:mt-0 mt-2 justify-center sm:justify-start">
           <a href="https://github.com/inventree/InvenTree" alr="officail github repo" class="ml-3 cm-gray-3">
diff --git a/_includes/base/header.html b/_includes/base/header.html
index f774bbcf..a9041ddb 100644
--- a/_includes/base/header.html
+++ b/_includes/base/header.html
@@ -6,9 +6,9 @@
       </a>
 
       <nav class="md:mr-auto md:ml-4 md:py-1 md:pl-4 md:border-l md:border-gray-400	flex flex-wrap items-center text-base justify-center">
-        <a class="mr-5 hover:cm-gray-1" href="{{ '/blog' | relative_url }}">Blog</a>
-        <a class="mr-5 hover:cm-gray-1" href="{{ site.plugin-link }}">Plugins</a>
-        <a class="mr-5 hover:cm-gray-1" href="{{ site.doc-link }}">Docs</a>
+        <a class="mr-5 hover:cm-gray-1" href="{% include fnc/link.html item=site.blog-link %}">Blog</a>
+        <a class="mr-5 hover:cm-gray-1" href="{% include fnc/link.html item=site.plugin-link %}">Plugins</a>
+        <a class="mr-5 hover:cm-gray-1" href="{% include fnc/link.html item=site.doc-link %}">Docs</a>
       </nav>
 
       {% if page.main_page %}
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/_includes/partial/publisher_ref.html b/_includes/partial/publisher_ref.html
index a1b97e53..222b462a 100644
--- a/_includes/partial/publisher_ref.html
+++ b/_includes/partial/publisher_ref.html
@@ -1,4 +1,4 @@
 {% assign publisher_ref = site.publishers | where: 'short_name', include.pub | first %}
-<a href="{{ publisher_ref.url | relative_url }}" class="custom-underline-blue">
-by <span class="inline-flex"><img src="https://github.com/{{ include.pub }}.png?size=40" alt="mdo" class="self-center w-5 h-5 rounded-full mx-1"> {{ include.pub }}</span>
+<a href="{{ publisher_ref.url | relative_url }}">
+<span class="inline-flex">by <img src="https://github.com/{{ include.pub }}.png?size=40" alt="mdo" class="self-center w-5 h-5 rounded-full" style="margin:0px"> {{ include.pub }}</span>
 </a>
\ No newline at end of file
diff --git a/_includes/plugin_card.html b/_includes/plugin_card.html
index 2c3d87fe..07e72ed1 100644
--- a/_includes/plugin_card.html
+++ b/_includes/plugin_card.html
@@ -2,10 +2,10 @@
     <div class="col p-4 d-flex flex-column position-static">
       <div class="d-inline-block">
         {% for cat in plugin.categories %}
-        <span class="badge rounded-pill bg-warning">{{ cat }}</span>
+        <span class="badge bg-yellow-500">{{ cat }}</span>
         {% endfor %}
         {% for tag in plugin.tags %}
-        <span class="badge rounded-pill bg-info">{{ tag }}</span>
+        <span class="badge bg-blue-400">{{ tag }}</span>
         {% endfor %}
       </div>
       <h3 class="mb-0">{{ plugin.name }}</h3>
diff --git a/_layouts/content.html b/_layouts/content.html
index 17e2f65c..a2a72a19 100644
--- a/_layouts/content.html
+++ b/_layouts/content.html
@@ -2,8 +2,13 @@
 layout: default
 ---
 
-
-<article class="prose prose-sm sm:prose lg:prose-lg xl:prose-xl mx-auto min-h-screen">
+<article class="prose prose-sm sm:prose lg:prose-lg xl:prose-xl mx-auto min-h-screen"
+{% if layout.fullwith %}
+style="max-width: 90%"
+{% endif %}
+>
+    {% if layout.notitle != true %}
     <h2>{{ page.title }}</h2>
+    {% endif %}
     {{ content }}
 </article>
diff --git a/_layouts/plugin.html b/_layouts/plugin.html
index f72203bc..87d99a35 100644
--- a/_layouts/plugin.html
+++ b/_layouts/plugin.html
@@ -1,20 +1,24 @@
 ---
-layout: default
+layout: content
+notitle: true
+fullwith: true
 ---
-<h1>{{ page.name }}</h1>
-{% include partial/publisher_ref.html pub=page.publisher %}
+<h2>{{ page.name }}
+<span class="sm:ml-2 text-sm">{% include partial/publisher_ref.html pub=page.publisher %}</span>
+</h2>
 
-<div class="row g-5">
-    <div class="col-md-8">
+<div class="md:flex md:flex-row flex-wrap">
+    <div class="w-full md:w-3/4">
         {{ content }}
     </div>
 
-    <div class="col-md-4">
-      <div class="position-sticky" style="top: 2rem;">
+    <div class="w-full md:w-1/4">
+      <h2 class="block sm:hidden">Link section</h2>
+      <div>
 
-        <div class="p-4 mb-3 bg-light rounded position-relative">
+        <div>
           <h4 class="fst-italic">Github</h4>
-          <p class="mb-0">{{ page.github | remove: "https://github.com/" }}</p>
+          <p>{{ page.github | remove: "https://github.com/" }}</p>
           <a href="{{ page.github }}" class="stretched-link" aria-label="open github repo"></a>
         </div>
 
@@ -22,7 +26,7 @@ layout: default
           <h4 class="fst-italic">Categories</h4>
           <ol class="list-unstyled">
             {% for categorie in page.categories %}
-            <li><a href="/categories/#{{ categorie | slugify }}"><span class="badge rounded-pill bg-warning">{{ categorie }}</span></a></li>
+            <li><a href="/categories/#{{ categorie | slugify }}"><span class="badge bg-yellow-500">{{ categorie }}</span></a></li>
             {% endfor %}
           </ol>
         </div>
@@ -31,17 +35,17 @@ layout: default
           <h4 class="fst-italic">Tags</h4>
           <ol class="list-unstyled">
             {% for tag in page.tags %}
-            <li><a href="/tags/#{{ tag | slugify }}"><span class="badge rounded-pill bg-info">{{ tag }}</span></a></li>
+            <li><a href="/tags/#{{ tag | slugify }}"><span class="badge bg-blue-400">{{ tag }}</span></a></li>
             {% endfor %}
           </ol>
         </div>
 
-        <div class="mb-3 position-relative">
+        <div>
           <h4 class="fst-italic">Website</h4>
-          <p class="mb-0">{{ page.website }}</p>
+          <p>{{ page.website }}</p>
           <a href="{{ page.website }}" class="stretched-link" aria-label="open website"></a>
         </div>
 
       </div>
     </div>
-  </div>
+</div>
diff --git a/_layouts/publisher.html b/_layouts/publisher.html
index e4cccd78..71f6f372 100644
--- a/_layouts/publisher.html
+++ b/_layouts/publisher.html
@@ -1,9 +1,14 @@
 ---
-layout: default
+layout: content
+notitle: true
 ---
 <h1>
-  <img src="https://github.com/{{ page.github }}.png?size=40" alt="mdo" class="rounded-circle" width="40" height="40">
-  {{ page.name }}
+  <div class="flex">
+    {% if page.github %}
+    <img src="https://github.com/{{ page.github }}.png?size=40" alt="mdo" class="rounded-full" width="40" height="40" style="margin:0px">
+    {% endif %}
+    {{ page.name }}
+  </div>
 </h1>
 
 <div>
@@ -17,7 +22,7 @@ layout: default
 </div>
 
 <blockquote class="blockquote">
-  <p class="mb-0">{{ content }}</p>
+  {{ content }}
 </blockquote>
 
 {% assign filtered_posts = site.posts | where: 'publisher', page.short_name %}
@@ -35,8 +40,11 @@ layout: default
 <h3>Plugins</h3>
 <ul class="list-unstyled">
   {% for plugin in filtered_plugins %}
-    <a href="{{ plugin.title }}"></a>
-    <li>{{ plugin.title }}</li>
+    <li>
+      <a href="{{ plugin.url | relative_url }}">
+      {{ plugin.title }}
+      </a>
+    </li>
   {% endfor %}
 </ul>
 {% endif %}
\ No newline at end of file
diff --git a/_posts/2021-10-25-starting.md b/_posts/2021-10-25-starting.md
index f7f4e7d0..650e2b27 100644
--- a/_posts/2021-10-25-starting.md
+++ b/_posts/2021-10-25-starting.md
@@ -1,5 +1,4 @@
 ---
-layout: post
 publisher: matmair
 title: Starting with templates
 ---
diff --git a/_posts/2021-11-11-lorem-ipsum.md b/_posts/2021-11-11-lorem-ipsum.md
new file mode 100644
index 00000000..af1b265a
--- /dev/null
+++ b/_posts/2021-11-11-lorem-ipsum.md
@@ -0,0 +1,5 @@
+---
+publisher: matmair
+title: lorem ipsum
+---
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
\ No newline at end of file
diff --git a/_posts/2022-02-12-lorem-ipsum.md b/_posts/2022-02-12-lorem-ipsum.md
new file mode 100644
index 00000000..af1b265a
--- /dev/null
+++ b/_posts/2022-02-12-lorem-ipsum.md
@@ -0,0 +1,5 @@
+---
+publisher: matmair
+title: lorem ipsum
+---
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
\ No newline at end of file
diff --git a/_publishers/matmair.md b/_publishers/matmair.md
index dec41a60..86f793c0 100644
--- a/_publishers/matmair.md
+++ b/_publishers/matmair.md
@@ -2,6 +2,6 @@
 short_name: matmair
 name: Matthias Mair
 github: matmair
-website: https:\\mjmair.com
+website: https://mjmair.com
 ---
 I try to build an ecosystem of reusable plugins and integrations for InvenTree. Code once and KISS!
diff --git a/about/credits.md b/about/credits.md
index cb824b75..09b2f43f 100644
--- a/about/credits.md
+++ b/about/credits.md
@@ -1,5 +1,4 @@
 ---
-layout: content
 title: Credits
 ---
 
diff --git a/about/imprint.md b/about/imprint.md
index 9642bccf..668941d2 100644
--- a/about/imprint.md
+++ b/about/imprint.md
@@ -1,5 +1,4 @@
 ---
-layout: content
 title: Imprint
 ---
 
diff --git a/about/index.md b/about/index.md
index 2f6deb69..8f5a4a82 100644
--- a/about/index.md
+++ b/about/index.md
@@ -1,5 +1,4 @@
 ---
-layout: content
 title: About
 ---
 InvenTree is an open-source inventory management system which provides intuitive parts management and stock control.
diff --git a/about/privacy.md b/about/privacy.md
index 1f16c22f..7acb7a67 100644
--- a/about/privacy.md
+++ b/about/privacy.md
@@ -1,5 +1,4 @@
 ---
-layout: content
 title: Privacy
 ---
 
diff --git a/about/social.md b/about/social.md
index cb824b75..09b2f43f 100644
--- a/about/social.md
+++ b/about/social.md
@@ -1,5 +1,4 @@
 ---
-layout: content
 title: Credits
 ---
 
diff --git a/about/source.md b/about/source.md
index 772aa977..e5c7970d 100644
--- a/about/source.md
+++ b/about/source.md
@@ -1,5 +1,4 @@
 ---
-layout: content
 title: How to get the source
 ---
 
diff --git a/about/team.md b/about/team.md
index 20fd33a0..5181d259 100644
--- a/about/team.md
+++ b/about/team.md
@@ -1,5 +1,4 @@
 ---
-layout: content
 title: The core team
 ---
 
diff --git a/about/thanks.md b/about/thanks.md
index 2fd7aae4..7912874b 100644
--- a/about/thanks.md
+++ b/about/thanks.md
@@ -1,5 +1,4 @@
 ---
-layout: content
 title: Offical Social Media channels
 ---
 
diff --git a/alternatives/index.md b/alternatives/index.md
index cc8d410d..8b278e76 100644
--- a/alternatives/index.md
+++ b/alternatives/index.md
@@ -1,5 +1,4 @@
 ---
-layout: content
 title: Alternatives
 ---
 
diff --git a/assets/android-chrome-192x192.png b/assets/android-chrome-192x192.png
new file mode 100644
index 00000000..353b2aae
Binary files /dev/null and b/assets/android-chrome-192x192.png differ
diff --git a/assets/android-chrome-192x192.png:Zone.Identifier b/assets/android-chrome-192x192.png:Zone.Identifier
new file mode 100644
index 00000000..e69de29b
diff --git a/assets/android-chrome-512x512.png b/assets/android-chrome-512x512.png
new file mode 100644
index 00000000..e4b6f4ff
Binary files /dev/null and b/assets/android-chrome-512x512.png differ
diff --git a/assets/android-chrome-512x512.png:Zone.Identifier b/assets/android-chrome-512x512.png:Zone.Identifier
new file mode 100644
index 00000000..e69de29b
diff --git a/assets/apple-touch-icon.png b/assets/apple-touch-icon.png
new file mode 100644
index 00000000..074c44d3
Binary files /dev/null and b/assets/apple-touch-icon.png differ
diff --git a/assets/apple-touch-icon.png:Zone.Identifier b/assets/apple-touch-icon.png:Zone.Identifier
new file mode 100644
index 00000000..e69de29b
diff --git a/assets/favicon-16x16.png b/assets/favicon-16x16.png
new file mode 100644
index 00000000..4f2b7c47
Binary files /dev/null and b/assets/favicon-16x16.png differ
diff --git a/assets/favicon-16x16.png:Zone.Identifier b/assets/favicon-16x16.png:Zone.Identifier
new file mode 100644
index 00000000..e69de29b
diff --git a/assets/favicon-32x32.png b/assets/favicon-32x32.png
new file mode 100644
index 00000000..68a03b58
Binary files /dev/null and b/assets/favicon-32x32.png differ
diff --git a/assets/favicon-32x32.png:Zone.Identifier b/assets/favicon-32x32.png:Zone.Identifier
new file mode 100644
index 00000000..e69de29b
diff --git a/assets/favicon.ico b/assets/favicon.ico
new file mode 100644
index 00000000..9797e08a
Binary files /dev/null and b/assets/favicon.ico differ
diff --git a/assets/favicon.ico:Zone.Identifier b/assets/favicon.ico:Zone.Identifier
new file mode 100644
index 00000000..e69de29b
diff --git a/assets/index.css b/assets/index.css
index 50949124..f1162fb5 100644
--- a/assets/index.css
+++ b/assets/index.css
@@ -50,4 +50,20 @@ layout: empty
         top: -72px;
         visibility: hidden;
     }
+
+    .badge {
+        @apply py-1 px-2.5 rounded-full
+    }
+
+    .list-unstyled {
+        padding-left: 0px;
+        position: initial;
+        @apply list-none
+    }
+
+    .list-unstyled li {
+        padding-left: 0px;
+        position: initial;
+        @apply list-none
+    }
 }
diff --git a/assets/site.webmanifest b/assets/site.webmanifest
new file mode 100644
index 00000000..45dc8a20
--- /dev/null
+++ b/assets/site.webmanifest
@@ -0,0 +1 @@
+{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}
\ No newline at end of file
diff --git a/assets/site.webmanifest:Zone.Identifier b/assets/site.webmanifest:Zone.Identifier
new file mode 100644
index 00000000..e69de29b
diff --git a/blog.html b/blog.html
index d564596e..70a3fd09 100644
--- a/blog.html
+++ b/blog.html
@@ -1,18 +1,19 @@
 ---
 layout: default
 title: Blog
+permalink: /blog
 ---
   <section class="cm-gray-2 body-font min-h-screen">
-    <div class="section-container">
+    <div class="pt-3 pb-1 section-container">
       <h1 class="header-text title-font mb-4 cm-gray-2">InvenTree Blog</h1>
-      <div class="flex flex-wrap -m-12">
+      <div class="flex flex-wrap">
 
       {% for post in site.posts %}
-        <div class="p-12 md:w-1/2 flex flex-col items-start">
+        <div class="p-6 md:w-1/2 flex flex-col items-start">
           <h2 class="header-text title-font mb-4 cm-gray-1">
             <a href="{{ post.url | relative_url }}">{{ post.title }}</a>
           </h2>
-          <span class="leading-relaxed mb-8">{{ post.excerpt }}</span>
+          <span class="leading-relaxed mb-4">{{ post.excerpt | strip_html | strip_newlines | truncate: 156  }}</span>
           <span>
             {{ post.date | date_to_string }} | 
           {% include partial/publisher_ref.html pub=post.publisher %}
diff --git a/contribute/code/architecture.md b/contribute/code/architecture.md
index 894e8568..bbc48ab2 100644
--- a/contribute/code/architecture.md
+++ b/contribute/code/architecture.md
@@ -1,5 +1,4 @@
 ---
-layout: content
 title: System Architecture
 ---
 
diff --git a/contribute/code/index.md b/contribute/code/index.md
index 0a32fa55..42e4182d 100644
--- a/contribute/code/index.md
+++ b/contribute/code/index.md
@@ -1,5 +1,4 @@
 ---
-layout: content
 title: Contribute Code
 ---
 
diff --git a/contribute/community.md b/contribute/community.md
index 6ba775f9..95b917da 100644
--- a/contribute/community.md
+++ b/contribute/community.md
@@ -1,5 +1,4 @@
 ---
-layout: content
 title: Help in the community
 ---
 
diff --git a/contribute/index.md b/contribute/index.md
index 880172e6..d740aed0 100644
--- a/contribute/index.md
+++ b/contribute/index.md
@@ -1,5 +1,4 @@
 ---
-layout: content
 title: Contribute
 ---
 
diff --git a/contribute/sponsor.md b/contribute/sponsor.md
index 6da21df5..9745a331 100644
--- a/contribute/sponsor.md
+++ b/contribute/sponsor.md
@@ -1,5 +1,4 @@
 ---
-layout: content
 title: Sponsoring
 ---
 
diff --git a/contribute/translate.md b/contribute/translate.md
index 1551de38..7219711c 100644
--- a/contribute/translate.md
+++ b/contribute/translate.md
@@ -1,5 +1,4 @@
 ---
-layout: content
 title: Translations
 ---
 
diff --git a/deploy/bare-metal.md b/deploy/bare-metal.md
index a9869db8..772a0b10 100644
--- a/deploy/bare-metal.md
+++ b/deploy/bare-metal.md
@@ -1,5 +1,4 @@
 ---
-layout: content
 title: Deploying to Bare Metal
 ---
 
diff --git a/deploy/cloud.md b/deploy/cloud.md
index d7a535ee..4ed1e148 100644
--- a/deploy/cloud.md
+++ b/deploy/cloud.md
@@ -1,5 +1,4 @@
 ---
-layout: content
 title: Deploying to Cloud
 ---
 
diff --git a/deploy/docker.md b/deploy/docker.md
index 0b4491fc..469254ff 100644
--- a/deploy/docker.md
+++ b/deploy/docker.md
@@ -1,5 +1,4 @@
 ---
-layout: content
 title: Deploying to Docker
 ---
 
diff --git a/deploy/index.md b/deploy/index.md
index ec0f55f8..3d66270c 100644
--- a/deploy/index.md
+++ b/deploy/index.md
@@ -1,5 +1,4 @@
 ---
-layout: content
 title: Deploying InvenTree
 ---
 
diff --git a/extend/api.md b/extend/api.md
index 7a1c87f5..835c3a06 100644
--- a/extend/api.md
+++ b/extend/api.md
@@ -1,5 +1,4 @@
 ---
-layout: content
 title: API
 ---
 
diff --git a/extend/index.md b/extend/index.md
index 258a9bb2..a021b839 100644
--- a/extend/index.md
+++ b/extend/index.md
@@ -1,5 +1,4 @@
 ---
-layout: content
 title: Ecosystem
 ---
 
diff --git a/extend/integrate/index.md b/extend/integrate/index.md
index 18f8cdcb..40f54b4f 100644
--- a/extend/integrate/index.md
+++ b/extend/integrate/index.md
@@ -1,5 +1,4 @@
 ---
-layout: content
 title: Integrate
 ---
 
diff --git a/extend/integrate/kntree.md b/extend/integrate/kntree.md
index 4e6cee34..02fac842 100644
--- a/extend/integrate/kntree.md
+++ b/extend/integrate/kntree.md
@@ -1,5 +1,4 @@
 ---
-layout: content
 title: Ki-n-Tree
 ---
 
diff --git a/extend/migrate/index.md b/extend/migrate/index.md
index 59251448..36f3a34d 100644
--- a/extend/migrate/index.md
+++ b/extend/migrate/index.md
@@ -1,5 +1,4 @@
 ---
-layout: content
 title: Migration tools
 ---
 
diff --git a/extend/plugin/index.md b/extend/plugin/index.md
index 3f051447..5f915805 100644
--- a/extend/plugin/index.md
+++ b/extend/plugin/index.md
@@ -1,11 +1,12 @@
 ---
-layout: content
 title: Plugins
 ---
 We supply core-dev and community built plugins to get you started with extending InvenTree's functionality. Plugins can hook into many parts of the UI, buisness logic and webserver.
 We expose some internal python APIs to speed up your development and keep the instance running while you discover the possibilities. [Learn more](# TODO plugins)
 
-### Highlights
+###
+
+ Highlights
 Use APIs supplied by your vendors or part libraries.
 - [Digikey](digikey)
 - [Octopart](octopart)
diff --git a/functions.md b/functions/index.md
similarity index 100%
rename from functions.md
rename to functions/index.md
diff --git a/plugins.html b/plugins.html
index eec50f87..09726f31 100644
--- a/plugins.html
+++ b/plugins.html
@@ -1,8 +1,9 @@
 ---
 layout: default
 title: Plugins
+permalink: /plugins
 ---
-<div class="section-container">
+<div class="pt-3 pb-1 section-container">
   <h1 class="header-text title-font mb-4 cm-gray-1">Plugins Repository</h1>
       {% for plugin in site.plugins %}
         {% include plugin_card.html plugin=plugin %}