diff --git a/Gemfile.lock b/Gemfile.lock
index c8b4bdd..b77a5c8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,6 +3,7 @@ GEM
   specs:
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
+    ast (2.4.2)
     colorator (1.1.0)
     concurrent-ruby (1.2.3)
     em-websocket (0.5.3)
@@ -38,6 +39,7 @@ GEM
       jekyll (>= 3.8, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
+    json (2.7.1)
     just-the-docs (0.5.0)
       jekyll (>= 3.8.5)
       jekyll-seo-tag (>= 2.0)
@@ -46,20 +48,42 @@ GEM
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
+    language_server-protocol (3.17.0.3)
     liquid (4.0.4)
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
+    parallel (1.26.3)
+    parser (3.3.0.5)
+      ast (~> 2.4.1)
+      racc
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (5.0.4)
+    racc (1.7.3)
+    rainbow (3.1.1)
     rake (13.1.0)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
+    regexp_parser (2.9.2)
     rexml (3.3.9)
     rouge (4.2.0)
+    rubocop (1.61.0)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.30.0)
+      parser (>= 3.2.1.0)
+    ruby-progressbar (1.13.0)
     safe_yaml (1.0.5)
     sass-embedded (1.70.0)
       google-protobuf (~> 3.25)
@@ -96,6 +120,7 @@ PLATFORMS
 DEPENDENCIES
   jekyll (~> 4.3)
   just-the-docs (= 0.5.0)
+  rubocop
 
 RUBY VERSION
    ruby 3.3.0p0
diff --git a/_includes/foundation-list-nav.html b/_includes/foundation-list-nav.html
new file mode 100644
index 0000000..31003e9
--- /dev/null
+++ b/_includes/foundation-list-nav.html
@@ -0,0 +1,6 @@
+
+{% capture fdnlistnav %}
+<small id="tagindex">View the FOSS Foundation Directory by:</small><br/>
+<a href="/listing">Alphabetical</a> | <a href="/categories/#newProjects">New Projects?</a> | <a href="/categories/#fiscalHost">Fiscal Hosting?</a> | <a href="/categories/#nonprofitStatus">By Nonprofit Type</a> | <a href="/categories/#addressCountry">By Country</a> | <a href="/categories/#coc">By Code of Conduct</a> | <a href="/openapi">OpenAPI</a><br/>
+<small>Other datasets: <a href="/sponsorships">Sponsorships</a> | <a href="/taxes">US 990 Taxes</a> | <a href="/entities">Unincorporated Projects</a> | <a href="/projects">Projects At Foundations</a> | <a href="/commercial">Commercial Orgs</a></small>
+{% endcapture %}
diff --git a/_layouts/categories.html b/_layouts/categories.html
index 691b4b9..c969b3e 100644
--- a/_layouts/categories.html
+++ b/_layouts/categories.html
@@ -6,7 +6,6 @@
 
 <hr id="tagindex" />
 {% capture mininav %}<a href="#newProjects">Accepts New Projects?</a> | <a href="#fiscalHost">Fiscal Hosting?</a> | <a href="#nonprofitStatus">Nonprofit Type</a> | <a href="#addressCountry">By Country</a> | <a href="#coc">Codes of Conduct</a>{% endcapture %}
-{{ mininav }}
 <section id="newProjects">
   <h3>Accepts New Projects?</h3>
   <p>These organizations actively accept new projects for hosting, and notes if they are a <a href="#fiscalHost">Fiscal Host</a>.</p>
@@ -31,8 +30,8 @@ <h3>Foundations By Country</h3>
   <table>
     <thead>
       <tr>
-        <th style="text-align: left">US</th>
-        <th style="text-align: left">Non-US</th>
+        <th style="text-align: left"><h4>US Foundations</h4></th>
+        <th style="text-align: left"><h4>Non-US Foundations</h4></th>
       </tr>
     </thead>
     <tbody>
@@ -56,7 +55,7 @@ <h3>Foundations By Nonprofit Types</h3>
   <table>
     <thead>
       <tr>
-        <th style="text-align: left">US 501(c)(3)</th>
+        <th style="text-align: left"><h4>US 501(c)(3)</h4></th>
         <th style="text-align: left">All Others</th>
       </tr>
     </thead>
@@ -68,11 +67,11 @@ <h3>Foundations By Nonprofit Types</h3>
           </ul>
         </td>
         <td style="text-align: left">
-          <p>US 501(c)(6)</p>
+          <h4>US 501(c)(6)</h4>
           <ul id="Nonprofit501c6">
           {% for fdn in site.foundations %}{% if fdn.nonprofitStatus == 'Nonprofit501c6' %}<li><a href="/foundations/{{ fdn.identifier }}">{{ fdn.commonName }}</a></li>{% endif %}{% endfor %}
           </ul>
-          <p>All non-US Nonprofits</p>
+          <h4>Non-US Nonprofits</h4>
           <ul id="nonus">
           {% assign otherfdn = site.foundations | where_exp: 'fdn', "fdn.nonprofitStatus != 'Nonprofit501c3' and fdn.nonprofitStatus != 'Nonprofit501c6'" %}
           {% for fdn in otherfdn %}<li><a href="/foundations/{{ fdn.identifier }}">{{ fdn.commonName }}</a> <span class="label label-blue">{{ fdn.nonprofitStatus }}</span></li>{% endfor %}
@@ -86,8 +85,8 @@ <h3>Foundations By Nonprofit Types</h3>
 {{ mininav }}
 <section id="coc">
   <h3>Codes of Conduct</h3>
-  <p>Obviously linked Codes of Conduct, including any noted inspirations for the source thereof.</p>
+  <p>Including <emphasis>obviously</emphasis> linked Codes of Conduct, with any noted inspirations for the source thereof.</p>
   <ul id="coclist">
-    {% for fdn in site.foundations %}{% if fdn.conducturl %}<li>{{ fdn.commonName }} <a href="{{ fdn.conducturl }}">{{ fdn.conducturl }}</a>{% if fdn.conductSource %}, <em>inspiration:</em> {{ fdn.conductSource }}{% endif %}{% if fdn.conductEvents %}, <a href="{{ fdn.conductEvents }}">Event-specific CoC</a>{% endif %}</li>{% endif %}{% endfor %}  
+    {% for fdn in site.foundations %}{% if fdn.conducturl %}<li>{{ fdn.commonName }} <a href="{{ fdn.conducturl }}">{{ fdn.conducturl }}</a>{% if fdn.conductSource %}, <em>inspiration:</em> {{ fdn.conductSource }}{% if fdn.conductSource contains 'Covenant' %} <span class="label label-purple">Covenant</span>{% endif %}{% endif %}{% if fdn.conductEvents %}, <a href="{{ fdn.conductEvents }}">Event-specific CoC</a>{% endif %}</li>{% endif %}{% endfor %}  
   </ul>
 </section>
diff --git a/_pages/categories.md b/_pages/categories.md
index 1f5192d..82ba31f 100644
--- a/_pages/categories.md
+++ b/_pages/categories.md
@@ -6,3 +6,6 @@ permalink: /categories
 nav_order: 3
 parent: Foundations Directory
 ---
+
+{% include foundation-list-nav.html %}
+{{ fdnlistnav }}
\ No newline at end of file
diff --git a/_pages/listing.md b/_pages/listing.md
index bc81e66..62f407d 100644
--- a/_pages/listing.md
+++ b/_pages/listing.md
@@ -7,6 +7,7 @@ nav_order: 2
 has_children: true
 ---
 
-A listing of **non-profit** foundations that host FOSS projects or are otherwise significant in the open source ecosystem.  
+An alphabetical listing of **non-profit** foundations that host FOSS projects or are otherwise significant in the open source ecosystem.
 
-Commercial entities and projects that aren't *independent* legal entities are not included here, as noted in our [data philosophy](data).  See our [OpenAPI spec](openapi).
+{% include foundation-list-nav.html %}
+{{ fdnlistnav }}