3 files changed, 24 insertions, 15 deletions
diff --git a/src/page/album-commentary.js b/src/page/album-commentary.js
index ebfb0ba9..eb462d9a 100644
--- a/src/page/album-commentary.js
+++ b/src/page/album-commentary.js
@@ -51,6 +51,7 @@ export function write(album) {
             html.tag('h3',
               {class: ['content-heading']},
               language.$('albumCommentaryPage.entry.title.albumCommentary')),
+
             html.tag('blockquote',
               transformMultiline(album.commentary)),
           ]),
diff --git a/src/page/album.js b/src/page/album.js
index 24033b1d..9ee57c09 100644
--- a/src/page/album.js
+++ b/src/page/album.js
@@ -132,6 +132,7 @@ export function write(album, {wikiData}) {
       generateAdditionalFilesShortcut,
       generateAdditionalFilesList,
       generateChronologyLinks,
+      generateContentHeading,
       generateNavigationLinks,
       getAlbumCover,
       getAlbumStylesheet,
@@ -339,13 +340,14 @@ export function write(album, {wikiData}) {
 
             ...html.fragment(
               hasAdditionalFiles && [
-                html.tag('p',
-                  {id: 'additional-files', class: ['content-heading']},
-                  language.$('releaseInfo.additionalFiles.heading', {
+                generateContentHeading({
+                  id: 'additional-files',
+                  title: language.$('releaseInfo.additionalFiles.heading', {
                     additionalFiles: language.countAdditionalFiles(numAdditionalFiles, {
                       unit: true,
                     }),
-                  })),
+                  }),
+                }),
 
                 generateAlbumAdditionalFilesList(album, album.additionalFiles, {
                   generateAdditionalFilesList,
@@ -357,9 +359,11 @@ export function write(album, {wikiData}) {
 
             ...html.fragment(
               album.commentary && [
-                html.tag('p',
-                  {class: ['content-heading']},
-                  language.$('releaseInfo.artistCommentary')),
+                generateContentHeading({
+                  id: 'artist-commentary',
+                  title: language.$('releaseInfo.artistCommentary'),
+                }),
+
                 html.tag('blockquote', transformMultiline(album.commentary)),
               ]),
           ],
diff --git a/src/page/flash.js b/src/page/flash.js
index a9ce053d..c116479a 100644
--- a/src/page/flash.js
+++ b/src/page/flash.js
@@ -20,6 +20,7 @@ export function write(flash, {wikiData}) {
     page: ({
       fancifyFlashURL,
       generateChronologyLinks,
+      generateContentHeading,
       generateNavigationLinks,
       getArtistString,
       getFlashCover,
@@ -65,11 +66,13 @@ export function write(flash, {wikiData}) {
 
           ...html.fragment(
             !empty(flash.featuredTracks) && [
-              html.tag('p',
-                {class: ['content-heading']},
-                language.$('releaseInfo.tracksFeatured', {
-                  flash: html.tag('i', flash.name),
-                })),
+              generateContentHeading({
+                id: 'features',
+                title:
+                  language.$('releaseInfo.tracksFeatured', {
+                    flash: html.tag('i', flash.name),
+                  }),
+              }),
 
               html.tag('ul',
                 flash.featuredTracks.map(track =>
@@ -85,9 +88,10 @@ export function write(flash, {wikiData}) {
 
           ...html.fragment(
             !empty(flash.contributorContribs) && [
-              html.tag('p',
-                {class: ['content-heading']},
-                language.$('releaseInfo.contributors')),
+              generateContentHeading({
+                id: 'contributors',
+                title: language.$('releaseInfo.contributors'),
+              }),
 
               html.tag('ul',
                 flash.contributorContribs.map(contrib =>