diff --git a/templates/partials/tagCard.html b/templates/partials/tagCard.html
new file mode 100644
index 000000000..f156fd052
--- /dev/null
+++ b/templates/partials/tagCard.html
@@ -0,0 +1,20 @@
+
\ No newline at end of file
diff --git a/templates/partials/tagsCards.html b/templates/partials/tagsCards.html
new file mode 100644
index 000000000..8f3a4ad3d
--- /dev/null
+++ b/templates/partials/tagsCards.html
@@ -0,0 +1,69 @@
+{% block content %}
+
+
+
+ {% set path_array = current_path | split(pat="/") %}
+ {% set taxonomy = path_array[1] %}
+ {% set tag = path_array[2] %}
+ {% if taxonomy == "tags" %} #
+ {{tag | replace(from='-', to='_' ) | title}}
+ {% endif %}
+
+
+
+
+{% endblock content %}
diff --git a/templates/partials/tagsSidebar.html b/templates/partials/tagsSidebar.html
new file mode 100644
index 000000000..9749154b0
--- /dev/null
+++ b/templates/partials/tagsSidebar.html
@@ -0,0 +1,24 @@
+
+
+
FILTER BY
+
All
+ {% set taxonomy = get_taxonomy(kind="tags") %}
+ {% set tags = taxonomy.items %}
+ {% for tag in tags %}
+ {% set path = tag.name | slugify %}
+ {% set fullpath = "/tags/" ~ path %}
+
#{{tag.name}}
+ {% endfor %}
+
+
+
+
\ No newline at end of file
diff --git a/templates/partnerPage.html b/templates/partnerPage.html
index 369084eab..7187c77fd 100644
--- a/templates/partnerPage.html
+++ b/templates/partnerPage.html
@@ -20,31 +20,6 @@
-
-
-
-
-
- {% for member in page.extra.members %}
- {% set fullpath = "/people/" ~ member %}
- {% set imgpath = "/images/" ~ member ~ "/" ~ member ~ ".jpeg" %}
- -
-
-
-
-
- {% endfor %}
-
-
-
-
-
{% if page.extra.websites %}
@@ -63,21 +38,10 @@
{% endif %}
{% for tag in page.taxonomies.tags %}
- {% set fullpath = "/tags/" ~ tag %}
- {{ tag }}
- {% endfor %}
+
+ {{tag}}
+
+ {% endfor %}
diff --git a/templates/tags/list.html b/templates/tags/list.html
deleted file mode 100644
index 7330b1fed..000000000
--- a/templates/tags/list.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% extends "index.html" %}
-
-{% block content %}
-
-{{ terms }}
-
-{% endblock content %}
diff --git a/templates/tags/single.html b/templates/tags/single.html
deleted file mode 100644
index 655485f60..000000000
--- a/templates/tags/single.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% extends "index.html" %}
-
-{% block content %}
-
-{% set section = get_section(path="join-us/_index.md")%}
-