diff --git a/structure/article.nix b/structure/article.nix
index bf4c6ab2..bf07ebc8 100644
--- a/structure/article.nix
+++ b/structure/article.nix
@@ -34,15 +34,19 @@ in
         body.content = lib.mkForce [
           (cfg.menus.main.outputs.html config)
           {
-            section.heading = {
-              # TODO: i18n support
-              # TODO: structured dates
-              before = [{ p.content = "Published ${config.date}"; }];
-              content = config.title;
-              after = [{ p.content = "Written by ${config.author}"; }];
+            section = {
+              heading = {
+                # TODO: i18n support
+                # TODO: structured dates
+                before = [{ p.content = "Published ${config.date}"; }];
+                content = config.title;
+                after = [{ p.content = "Written by ${config.author}"; }];
+              };
+              content = [
+                (cfg.templates.html.markdown { inherit (config) name body; })
+              ];
             };
           }
-          (cfg.templates.html.markdown { inherit (config) name body; })
         ];
       };
     });
diff --git a/structure/page.nix b/structure/page.nix
index 8d255c14..6c20719c 100644
--- a/structure/page.nix
+++ b/structure/page.nix
@@ -64,8 +64,14 @@ in
       };
       body.content = [
         (cfg.menus.main.outputs.html page)
-        { section.heading.content = page.title; }
-        (cfg.templates.html.markdown { inherit (page) name body; })
+        {
+          section = {
+            heading.content = page.title;
+            content = [
+              (cfg.templates.html.markdown { inherit (page) name body; })
+            ];
+          };
+        }
       ];
     };
   });