diff --git a/docs/data-model.rst b/docs/data-model.rst
--- a/docs/data-model.rst
+++ b/docs/data-model.rst
@@ -1,5 +1,3 @@
-:orphan:
-
 .. _data-model:
 
 Data model
diff --git a/docs/index.rst b/docs/index.rst
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -5,18 +5,10 @@
 
 Implementation of the :ref:`data-model` to archive source code artifacts.
 
-
-Overview
---------
-
-* :ref:`data-model`
-* :ref:`persistent-identifiers`
-
-
-Reference Documentation
------------------------
-
 .. toctree::
-   :maxdepth: 2
+   :caption: Overview:
+   :titlesonly:
 
+   data-model
+   persistent-identifiers
    /apidoc/swh.model
diff --git a/docs/persistent-identifiers.rst b/docs/persistent-identifiers.rst
--- a/docs/persistent-identifiers.rst
+++ b/docs/persistent-identifiers.rst
@@ -1,10 +1,12 @@
-:orphan:
-
 .. _persistent-identifiers:
 
+======================
 Persistent identifiers
 ======================
 
+Description
+===========
+
 You can point to objects present in the Software Heritage archive by the means
 of **persistent identifiers** that are guaranteed to remain stable (persistent)
 over time. Their syntax, meaning, and usage is described below. Note that they