diff --git a/_data/navigation.yml b/_data/navigation.yml
index 38456c4e..a6557488 100644
--- a/_data/navigation.yml
+++ b/_data/navigation.yml
@@ -1,12 +1,10 @@
 # main links
 main:
-  - title: "Posts by Category"
-    url: "/categories/"
   - title: "Posts by Tag"
     url: "/tags/"
   - title: "Sitemap"
     url: "/sitemap/"
-  - title: "DIDecentral - Community Site"
+  - title: "DIDecentral"
     url: "https://didecentral.com"
   - title: "RebootingWebOfTrust - Archive"
     url: "https://sourcecrypto.pub/decentralized-web/"
@@ -32,10 +30,8 @@ didnav:
       - title: "• RWoT - Papers Index"
         url: "https://decentralized-id.com/workshops/rebooting-web-of-trust/"
       - title: "• Microledgers and Edgechains—HGF18"
-        description: "A Transcript of Daniel Hardman of Evernym Presenting at Hyperledger Global Forum—18"
         url: "https://decentralized-id.com/hgf-2018/Microledgers-Edgechains-Hardman-HGF/"
       - title: "• Verifiable Organizations Network—HGF18"
-        description: "Transcript of Presentation by John Jordan and Stephen Curran at HGF 2018"
         url: "https://decentralized-id.com/hgf-2018/VerifiableOrganizationsNetwork-HGF/"
       - title: "• Hyperledger Indy"
         url: "https://decentralized-id.com/indy-ecosystem/"
@@ -60,7 +56,7 @@ didnav:
       - title: "• Video, Podcasts and Slideshare"
         url: "https://decentralized-id.com/media/"
       - title: "• Hyperledger Global Forum - 2018"
-        url: "https://decentralized-id.com/hgf-2018/"
+        url: "https://decentralized-id.com/hyperledger/hgf-2018/"
   - title: Self-Sovereign Identity
     children:
       - title: "• SSI - Documentation Efforts"
diff --git a/_layouts/home.html b/_layouts/home.html
index 55d5521f..652fa452 100644
--- a/_layouts/home.html
+++ b/_layouts/home.html
@@ -8,13 +8,45 @@ layout: archive
 
 {{ content }}
 
-<h2 class="archive__subtitle">Posts</h2>
+<h2 class="archive__subtitle">Categories</h2>
 
-{% for post in paginator.posts %}
-  {% include archive-single.html %}
+{% assign categories_max = 0 %}
+{% for category in site.categories %}
+  {% if category[1].size > categories_max %}
+    {% assign categories_max = category[1].size %}
+  {% endif %}
+{% endfor %}
+
+<ul class="taxonomy__index">
+  {% for i in (1..categories_max) reversed %}
+    {% for category in site.categories %}
+      {% if category[1].size == i %}
+        <li>
+          <a href="#{{ category[0] | slugify }}">
+            <strong>{{ category[0] }}</strong> <span class="taxonomy__count">{{ i }}</span>
+          </a>
+        </li>
+      {% endif %}
+    {% endfor %}
+  {% endfor %}
+</ul>
+
+{% for i in (1..categories_max) reversed %}
+  {% for category in site.categories %}
+    {% if category[1].size == i %}
+      <section id="{{ category[0] | slugify | downcase }}" class="taxonomy__section">
+        <h2 class="archive__subtitle">{{ category[0] }}</h2>
+        <div class="entries-{{ page.entries_layout | default: 'list' }}">
+          {% for post in category.last %}
+            {% include archive-single.html type=page.entries_layout %}
+          {% endfor %}
+        </div>
+        <a href="#page-title" class="back-to-top">{{ site.data.ui-text[site.locale].back_to_top | default: 'Back to Top' }} &uarr;</a>
+      </section>
+    {% endif %}
+  {% endfor %}
 {% endfor %}
 
-{% include paginator.html %}
 
 {% include social-share.html %}
 
diff --git a/index.html b/index.html
index 6654c280..01910f2a 100644
--- a/index.html
+++ b/index.html
@@ -6,7 +6,7 @@ sidebar:
 welcome:
   - image_path: https://didecentral.com/assets/images/didecentral-community-teaser.png
     alt: "Wecome to DIDecentral Teaser Image"
-    title: "Welcome to DIDecentral - Community Website"
+    title: "DIDecentral - Community Website"
     excerpt: "DIDecentral is a collaborative curation initiative aiming to create quality, Public Domain, educational content about Sovereign-Identity: Principles, Specs, Code and Initiatives."
     url: "https://didecentral.com/welcome-didecentral/"
     btn_class: "btn--primary"