diff --git a/content/designs/application-layout.md b/content/designs/application-layout.md
index 6ad54c90fce05bb6f58e9e11732ab04cc5581627..501f2a0813b5e3566e08f0dfcc369c42c78d0b8b 100644
--- a/content/designs/application-layout.md
+++ b/content/designs/application-layout.md
@@ -82,8 +82,8 @@ functionality that is not necessarily long-term stable.
 ### Variable files
 
 * The programs in application bundles may save variable data
-  (configuration, state and/or cached files) for each [user]. ([Applications
-  design] §3, "Data Storage")
+  (configuration, state and/or cached files) for each [user]
+  ([Applications design - Data Storage]).
     * *Configuration* is any setting or preference for which there is a
       reasonable default value. If configuration is deleted, the expected
       result is that the user is annoyed by the preference being reset,
@@ -105,7 +105,7 @@ functionality that is not necessarily long-term stable.
       it from a backup.
 * The programs in application bundles may save variable data
   (configuration, state and/or cached files) that are shared between all
-  [users][user]. ([Applications design] §3, "Data Storage")
+  [users][user] ([Applications design - Data storage]).
 * [Newport needs to be able to write downloaded files][bug 283] to a
   designated directory owned by the application bundle.
     * Because Newport is a platform service, its AppArmor profile will
@@ -120,7 +120,7 @@ functionality that is not necessarily long-term stable.
   vulnerabilities considerably more difficult to exploit.
 * Large media files such as music and videos should normally be
   shared between all [users][user] and all multimedia application
-  bundles. ([Multi-user design] §3, "Requirements")
+  bundles. ([Multi-user design - Requirements])
 
 ### Upgrade, rollback, reset and uninstall
 
@@ -1313,20 +1313,22 @@ writing, no implementations of this idea are known.
 <!-- Other documents -->
 
 [Apertis Application Bundle Specification]: https://appdev.apertis.org/documentation/bundle-spec.html
-[Applications design]: applications.md
-[Applications design document]: applications.md
+[Applications design]: {{< ref "applications.md" >}}
+[Applications design document]: {{< ref "applications.md" >}}
+[Applications design - Data storage]: {{< ref "applications.md#data-storage" >}}
 [Application Entry Points]: {{< ref "application-entry-points.md" >}}
 [App store approval]:  {{< ref "app_store_approval.md" >}} 
 [Interface discovery]:  {{< ref "interface_discovery.md" >}} 
-[Multimedia design]: multimedia.md
-[Multimedia design document]: multimedia.md
-[Multi-user design]: multiuser.md
-[Multi-user design document]: multiuser.md
-[Preferences and Persistence design document]: preferences-and-persistence.md
-[System Update and Rollback design]: system-updates-and-rollback.md
-[System Update and Rollback design document]: system-updates-and-rollback.md
-[Security design]: security.md
-[Security design document]: security.md
+[Multimedia design]: {{< ref multimedia.md >}}
+[Multimedia design document]: {{< ref multimedia.md >}}
+[Multi-user design]: {{< ref multiuser.md >}}
+[Multi-user design document]: {{< ref multiuser.md >}}
+[Multi-user design - Requirements]: {{< ref "multiuser.md#requirements" >}}
+[Preferences and Persistence design document]: {{< ref preferences-and-persistence.md >}}
+[System Update and Rollback design]: {{< ref system-updates-and-rollback.md >}}
+[System Update and Rollback design document]: {{< ref system-updates-and-rollback.md >}}
+[Security design]: {{< ref security.md >}}
+[Security design document]: {{< ref security.md >}}
 
 <!-- Glossary -->