diff --git a/_data/team.yml b/_data/team.yml
index f6e95fad..8daa4cce 100644
--- a/_data/team.yml
+++ b/_data/team.yml
@@ -1,6 +1,6 @@
 text: InvenTree has had 40+ contributors since the project started in March 2017. Here are some of the currently most active devs.
 team:
-  - tag: oliver
+  - tag: SchrodingersGat
     name: Oliver
     text: Oliver is an Australian EE. He started InvenTree in 2017 and is the maintainer.
     links:
diff --git a/_layouts/publisher.html b/_layouts/publisher.html
index d0a85e27..c7f06210 100644
--- a/_layouts/publisher.html
+++ b/_layouts/publisher.html
@@ -2,14 +2,16 @@
 layout: content
 notitle: true
 ---
-<h1>
-  <div class="flex">
+<h2>
+  <div class="flex items-end">
     {% 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">
+    <div class="mb-1">
+      <img src="https://github.com/{{ page.github }}.png?size=40" alt="mdo" class="rounded-full" width="40" height="40" style="margin:0px">
+    </div>
     {% endif %}
     {{ page.name }}
   </div>
-</h1>
+</h2>
 
 <div>
 {% if page.github %}
@@ -17,7 +19,12 @@ notitle: true
 {% endif %}
 
 {% if page.website %}
-<a href="{{page.website}}"><span class="badge bg-secondary">Official Website</span></a>
+<a href="{{page.website}}"><span class="badge bg-secondary">Website</span></a>
+{% endif %}
+
+{% assign filtered_team = site.data.team.team | where: 'tag', page.short_name %}
+{% if filtered_team and filtered_team.size != 0  %}
+<a href="{% link about/team.html %}"><span class="badge bg-lime-600"><span class="fa-solid fa-shield"></span>Team Member</span></a>
 {% endif %}
 </div>
 
@@ -25,7 +32,7 @@ notitle: true
   {{ content }}
 </blockquote>
 
-{% assign filtered_posts = site.posts | where: 'publisher', page.short_name %}
+{% assign filtered_posts = site.posts | where: 'author', page.short_name %}
 {% if filtered_posts and filtered_posts.size != 0 %}
 <h3>Posts</h3>
 <ul class="list-unstyled">
@@ -35,7 +42,7 @@ notitle: true
 </ul>
 {% endif %}
 
-{% assign filtered_plugins = site.repo | where: 'publisher', page.short_name %}
+{% assign filtered_plugins = site.repo | where: 'author', page.short_name %}
 {% if filtered_plugins and filtered_plugins.size != 0 %}
 <h3>Plugins</h3>
 <ul class="list-unstyled">
diff --git a/_repo/shopify.md b/_repo/shopify.md
index 0d395825..6bb88767 100644
--- a/_repo/shopify.md
+++ b/_repo/shopify.md
@@ -1,6 +1,6 @@
 ---
 name: ShopifyIntegrationPlugin org
-publisher: matmair
+author: matmair
 website: https://mjmair.com
 github: https://github.com/matmair/ShopifyIntegrationPlugin
 categories:
diff --git a/about/team.html b/about/team.html
new file mode 100644
index 00000000..1a20c703
--- /dev/null
+++ b/about/team.html
@@ -0,0 +1,33 @@
+---
+title: Team
+---
+
+{{site.data.team.text}}
+<br/>
+
+<h3>Maintainer</h3>
+
+<h4>SchrodingersGat</h4>
+<p>Oliver is an Australian EE. He started InvenTree in 2017 and is the maintainer.
+    <a href="https://github.com/SchrodingersGat" alt="learn more">GitHub</a>
+</p>
+
+<h3>Active Team</h3>
+
+{% for item in site.data.team.team %}
+    <h4>{{ item.tag }}</h4>
+    <p>{{ item.text }}
+        <span class="inline-flex">
+        {% for link in item.links %}
+            <a href="{{ link.link }}" alt="learn more">{{ link.text }}</a>
+        {% endfor %}
+        </span>
+    </p>
+{% endfor %}
+
+<h3>Contributors</h3>
+<p>ToDo / Looking for suggestions.</p>
+
+
+<h3>Disclaimer</h3>
+<p>The list is in no way complete and only contains the most active devs when the website was created. If you feel someone is missing feel free to open an issue in the GitHub repo.</p>
\ No newline at end of file
diff --git a/about/team.md b/about/team.md
deleted file mode 100644
index 87afef75..00000000
--- a/about/team.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-title: Team
----
-
-InvenTree has had 40+ contributors since the project started in March 2017.
-
-### Maintainer
-
-#### SchrodingersGat
-Oliver is an Australian EE. He started InvenTree in 2017 and is the maintainer.
-[GitHub](https://github.com/SchrodingersGat)
-
-### Active Team
-
-#### eeintech
-Francois is an EE. He is part of the core team and the maintainer of [Ki-nTree](https://github.com/sparkmicro/Ki-nTree).
-[GitHub](https://github.com/eeintech)
-
-#### matmair
-Matthias is an Austrian developer. He is part of the core team and focuses on `enterprise` enhancement.
-[GitHub](https://github.com/matmair)
-
-### Contributors
-ToDo / Looking for suggestions.
-
-
-### Disclaimer
-The list is in no way complete and only contains the most active devs when the website was created. If you feel someone is missing feel free to open an issue in the GitHub repo.
-