diff --git a/.github/ISSUE_TEMPLATE/add-a-new-gap-analysis-topic.md b/.github/ISSUE_TEMPLATE/add-a-new-gap-analysis-topic.md
index 9b17b10..a23c6c8 100644
--- a/.github/ISSUE_TEMPLATE/add-a-new-gap-analysis-topic.md
+++ b/.github/ISSUE_TEMPLATE/add-a-new-gap-analysis-topic.md
@@ -9,20 +9,29 @@ assignees: ''
 
 <i class="meta">This issue is applicable to most_languages.</i>
 
-Brief_intro
+Brief_intro_illustrating_the_issue
 
-**Specs:**
-Describe_status_of_related_spec_work
 
-**Tests & results:**
-Point_to_a_test
+<b class="subhead">Specs:</b>
+[issue XXX](url) Closed.
+
+[shortname](url_to_section) describe_what_it_says
+
+
+<b class="subhead">Tests & results:</b>
+<i>interactive test</i>, [assertion](url)<br>
+<i>i18n test suite</i>, [section_head](url)
+
 Summarise_the_results_for_each_major_engine
+<span class="pass">Gecko</span>, <span class="partial">Blink</span>, and <span class="fail">Webkit</span>
+
+
+<b class="subhead">Browser bug reports:</b>
+[Gecko](url) • [Blink](url) • [Webkit](url)
 
-**Browser bug reports:**
-List_of_links_to_related_bug_reports
 
-**Priority:**
-Explain_why_you_chose_the_priority
+<b class="subhead">Priority:</b>
+Why_you_chose_the_priority
 
-Move the following to the second comment in the thread:
-_The first comment in this issue contains text that will automatically appear in [the Arabic & Persian gap-analysis document](https://w3c.github.io/sealreq/gap-analysis/alreq-gap#XXX) as a subsection with the same title as this issue. Any edits made to that comment will be immediately available in the document. Proposals for changes or discussion of the content can be made in comments below this point._
+_The first comment in this issue contains text that will automatically appear in [the Arabic & Persian gap-analysis document](https://w3c.github.io/alreq/gap-analysis/alreq-gap#XXX) as a topic with the same title as this issue. Any edits made to that comment will be immediately available in the Editor's draft of the document. Proposals for changes or discussion of the content can be made in comments below this point._
+_The first comment in this issue contains text that will automatically appear in several gap-analysis documents in the Vertical Text section, as a topic with the same title as this issue. Any edits made to that comment will be immediately available in the Editor's draft of the document. Proposals for changes or discussion of the content can be made in comments below this point._