diff --git a/discussion.html b/discussion.html
index 2b2555042..948408d47 100644
--- a/discussion.html
+++ b/discussion.html
@@ -189,14 +189,22 @@
 
     <div class="container">
 
-      <h2 id="discussion">Discussion</h2>
+      <h1 id="discussion">Discussion</h1>
+
+<p>CF discussions and decisions are mostly made on <a href="https://github.com">GitHub</a>. No registration with CF is required to contribute; all that is needed is a freely available GitHub account.</p>
+
+<h2 id="questions-comments-and-announcements-about-cf">Questions, comments and announcements about CF</h2>
 
 <p>To ask a question about how to use CF, to comment on any aspect of CF or to make a suggestion how CF could be changed or improved, please visit CF <a href="https://github.com/orgs/cf-convention/discussions">GitHub organization Discussions</a>. There you can start a new discussion, contribute to any of the ongoing ones, and read the previous ones. Announcements about CF are made there as well.</p>
 
 <p>To keep up-to-date with announcements and other discussions, go to the <a href="https://github.com/cf-convention/discuss/issues"><code class="language-plaintext highlighter-rouge">discuss</code> repository</a> and enable email notifications from the <svg aria-hidden="true" height="16" version="1.1" width="16" data-view-component="true" class="octicon octicon-eye"><path d="M8 2c1.981 0 3.671.992 4.933 2.078 1.27 1.091 2.187 2.345 2.637 3.023a1.62 1.62 0 0 1 0 1.798c-.45.678-1.367 1.932-2.637 3.023C11.67 13.008 9.981 14 8 14c-1.981 0-3.671-.992-4.933-2.078C1.797 10.83.88 9.576.43 8.898a1.62 1.62 0 0 1 0-1.798c.45-.677 1.367-1.931 2.637-3.022C4.33 2.992 6.019 2 8 2ZM1.679 7.932a.12.12 0 0 0 0 .136c.411.622 1.241 1.75 2.366 2.717C5.176 11.758 6.527 12.5 8 12.5c1.473 0 2.825-.742 3.955-1.715 1.124-.967 1.954-2.096 2.366-2.717a.12.12 0 0 0 0-.136c-.412-.621-1.242-1.75-2.366-2.717C10.824 4.242 9.473 3.5 8 3.5c-1.473 0-2.825.742-3.955 1.715-1.124.967-1.954 2.096-2.366 2.717ZM8 10a2 2 0 1 1-.001-3.999A2 2 0 0 1 8 10Z"></path>
 </svg> <b>Watch</b> drop-down menu.</p>
 
-<p>❓ Questions and answers about using CF: <a href="https://github.com/orgs/cf-convention/discussions/categories/q-a-about-using-cf">all</a> • <a href="https://github.com/orgs/cf-convention/discussions/categories/q-a-about-using-cf/?discussions_q=label%3Aconventions">conventions</a></p>
+<p>❓ <a href="https://github.com/orgs/cf-convention/discussions/categories/q-a-about-using-cf">Questions and answers about using CF</a></p>
+
+<p>💬 <a href="https://github.com/orgs/cf-convention/discussions/categories/comments-and-ideas-for-changing-cf">Comments and ideas for changing CF</a></p>
+
+<p>📣; [Announcements relevant to CF][github_announce]</p>
 
 <h2 id="proposals-to-change-cf">Proposals to change CF</h2>
 
@@ -224,8 +232,6 @@ <h2 id="proposals-to-change-cf">Proposals to change CF</h2>
   </li>
 </ul>
 
-<p>No registration with CF is required to contribute; all that is needed is a freely available <a href="https://github.com">GitHub account</a>.</p>
-
 <h2 id="archive-links">Archive links</h2>
 
 <p>Announcements, discussions and Q&amp;A that were initiated <em>before</em> CF GitHub Discussions began are continuing as <a href="https://guides.github.com/features/issues">GitHub issues</a> in the <a href="https://github.com/cf-convention/discuss/issues"><code class="language-plaintext highlighter-rouge">discuss</code> repository</a>. They will soon be converted to GitHub Discussions.</p>