diff --git a/_data/index/modules.yml b/_data/index/modules.yml
deleted file mode 100644
index 165e42f..0000000
--- a/_data/index/modules.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: ConfluencePS
-- name: JiraAgilePS
-- name: JiraPS
-- name: AtlassianPS.Configuration
diff --git a/_data/modules.yml b/_data/modules.yml
index d82d584..753ad0e 100644
--- a/_data/modules.yml
+++ b/_data/modules.yml
@@ -2,34 +2,48 @@
   description: A PowerShell module that interacts with Atlassian's Confluence wiki product.
   github: https://github.com/AtlassianPS/ConfluencePS
   path: /module/ConfluencePS
+  docs: /docs/ConfluencePS
+  gallery: https://www.powershellgallery.com/packages/ConfluencePS
   status: active
 - name: JiraAgilePS
   description: PowerShell module to interact with Jira's Agile plugin
   github: https://github.com/AtlassianPS/JiraAgilePS
   path: /module/JiraAgilePS
+  docs: /docs/JiraAgilePS
+  gallery: https://www.powershellgallery.com/packages/JiraAgilePS
   status: active
 - name: JiraPS
-  description: PowerShell module to interact with Atlassian JIRA
+  description: PowerShell module to interact with Atlassian Jira.
   github: https://github.com/AtlassianPS/JiraPS
   path: /module/JiraPS
+  docs: /docs/JiraPS
+  gallery: https://www.powershellgallery.com/packages/JiraPS
   status: active
 - name: AtlassianPS.Configuration
-  description: A module for AtlassianPS modules to use for managing connections
+  description: Shared connection and server configuration for AtlassianPS modules.
   github: https://github.com/AtlassianPS/AtlassianPS.Configuration
   path: /module/AtlassianPS.Configuration
+  docs: /docs/AtlassianPS.Configuration
+  gallery: https://www.powershellgallery.com/packages/AtlassianPS.Configuration
   status: active
 - name: AtlassianPS
-  description: Legacy metapackage; not an active documentation target.
+  description: Repository for cross-cutting AtlassianPS issues and coordination.
   github: https://github.com/AtlassianPS/AtlassianPS
   path: /module/AtlassianPS
-  status: legacy
+  docs:
+  gallery:
+  status: repository
 - name: BitbucketPS
-  description: Legacy Bitbucket module; not an active documentation target.
+  description: Historical Bitbucket repository; not an active website documentation target.
   github: https://github.com/AtlassianPS/BitbucketPS
   path: /module/BitbucketPS
-  status: legacy
+  docs:
+  gallery:
+  status: repository
 - name: HipChatPS
-  description: Legacy HipChat module; not an active documentation target.
+  description: Historical HipChat repository; not an active website documentation target.
   github: https://github.com/AtlassianPS/HipChatPS
   path: /module/HipChatPS
-  status: legacy
+  docs:
+  gallery:
+  status: repository
diff --git a/_data/navigation.yml b/_data/navigation.yml
index d6fa249..d61fcd3 100644
--- a/_data/navigation.yml
+++ b/_data/navigation.yml
@@ -3,12 +3,8 @@
   childs:
     - name: AtlassianPS.Configuration
       path: module/AtlassianPS.Configuration
-    # - name: BitbucketPS
-    #   path: module/BitbucketPS
     - name: ConfluencePS
       path: module/ConfluencePS
-    # - name: HipChatPS
-    #   path: module/HipChatPS
     - name: JiraAgilePS
       path: module/JiraAgilePS
     - name: JiraPS
@@ -22,8 +18,6 @@
     - name: Gallery
       path: docs/Gallery
       listChilds: true
-    # - name: BitbucketPS
-    #   path: docs/BitbucketPS
     - name: AtlassianPS.Configuration
       path: docs/AtlassianPS.Configuration
       groups:
@@ -41,8 +35,6 @@
       groups:
         - About
         - Commands
-    # - name: HipChatPS
-    #   path: docs/HipChatPS
     - name: JiraPS
       path: docs/JiraPS
       groups:
diff --git a/_includes/sections/modules.html b/_includes/sections/modules.html
index c7a3fd4..e5fa612 100644
--- a/_includes/sections/modules.html
+++ b/_includes/sections/modules.html
@@ -1,12 +1,13 @@
 <div class="row module-wrapper">
-    {% for module in site.data.index.modules %}
+    {% assign activeModules = site.data.modules | where: "status", "active" %}
+    {% for module in activeModules %}
     <div
         user="AtlassianPS"
         repo="{{ module.name }}"
         class="module item col-10 col-md-5 ml-auto mr-auto"
     >
         <div class="module-item">
-            <a class="link" href="/module/{{ module.name }}">
+            <a class="link" href="{{ module.path }}">
                 <img
                     src="/assets/img/{{ module.name }}.png"
                     class="logo img-responsive"
@@ -14,11 +15,11 @@
                 />
                 <h3 class="item-title">{{ module.name }}</h3>
             </a>
-            <p class="item-description"></p>
+            <p class="item-description">{{ module.description }}</p>
             <div class="ghbtn">
                 <a
                     target="_blank"
-                    href="#"
+                    href="{{ module.github }}"
                     class="btn btn-xs btn-white html_url"
                     alt="Repository"
                 >
@@ -26,7 +27,7 @@ <h3 class="item-title">{{ module.name }}</h3>
                 </a>
                 <a
                     target="_blank"
-                    href="https://github.com/AtlassianPS/{{ module.name }}/issues"
+                    href="{{ module.github }}/issues"
                     class="btn btn-xs btn-white repo"
                     alt="Report Issue"
                 >
@@ -35,7 +36,7 @@ <h3 class="item-title">{{ module.name }}</h3>
                 <br />
                 <a
                     target="_blank"
-                    href="https://www.powershellgallery.com/packages/{{ module.name }}"
+                    href="{{ module.gallery }}"
                     class="btn btn-xs btn-white gallery"
                     alt="Gallery Downloads"
                 >
@@ -43,14 +44,14 @@ <h3 class="item-title">{{ module.name }}</h3>
                 >
                 <a
                     target="_blank"
-                    href="https://github.com/AtlassianPS/{{ module.name }}/stargazers"
+                    href="{{ module.github }}/stargazers"
                     class="btn btn-xs btn-white star"
                 >
                     <i class="fas fa-star"></i> ...</a
                 >
                 <a
                     target="_blank"
-                    href="https://github.com/AtlassianPS/{{ module.name }}/network"
+                    href="{{ module.github }}/network"
                     class="btn btn-xs btn-white fork"
                 >
                     <i class="fas fa-code-branch"></i> ...</a
diff --git a/pages/module.md b/pages/module.md
index 44f78d2..b03282c 100644
--- a/pages/module.md
+++ b/pages/module.md
@@ -8,8 +8,13 @@ permalink: /module/
 
 AtlassianPS maintains PowerShell modules for Atlassian products and shared AtlassianPS configuration.
 
+{% assign activeModules = site.data.modules | where: "status", "active" %}
+{% assign otherRepositories = site.data.modules | where: "status", "repository" %}
+
+## Active modules
+
 <div class="row module-wrapper">
-{% for module in site.data.modules %}
+{% for module in activeModules %}
     <div class="module item col-12 col-md-6">
         <div class="module-item card h-100">
             <div class="card-body">
@@ -20,10 +25,22 @@ AtlassianPS maintains PowerShell modules for Atlassian products and shared Atlas
                 <p>{{ module.description }}</p>
                 <p>
                     <a class="btn btn-square btn-outline" href="{{ module.path }}">Module details</a>
+                    {% if module.docs %}<a class="btn btn-square btn-outline" href="{{ module.docs }}">Documentation</a>{% endif %}
                     <a class="btn btn-square btn-outline" href="{{ module.github }}">Source code</a>
+                    {% if module.gallery %}<a class="btn btn-square btn-outline" href="{{ module.gallery }}">PowerShell Gallery</a>{% endif %}
                 </p>
             </div>
         </div>
     </div>
 {% endfor %}
 </div>
+
+## Other repositories
+
+These repositories are part of AtlassianPS, but they are not published modules on this website.
+
+<ul>
+{% for module in otherRepositories %}
+    <li><a href="{{ module.github }}">{{ module.name }}</a>: {{ module.description }}</li>
+{% endfor %}
+</ul>