diff --git a/website/_includes/_functions.jade b/website/_includes/_functions.jade
index eb16d9659..39139cc58 100644
--- a/website/_includes/_functions.jade
+++ b/website/_includes/_functions.jade
@@ -41,9 +41,6 @@
 -           var comps = path.split('#');
 -           return "top-level#" + comps[0] + '.' + comps[1];
 -       }
--       else if (path.startsWith('cli#')) {
--           return "top-level#" + path.split('#')[1];
--       }
 -       return path;
 -   }
 
diff --git a/website/api/_data.json b/website/api/_data.json
index ba7997690..0be09b782 100644
--- a/website/api/_data.json
+++ b/website/api/_data.json
@@ -3,8 +3,10 @@
         "Overview": {
             "Architecture": "./",
             "Annotation Specs": "annotation",
+            "Command Line": "cli",
             "Functions": "top-level"
         },
+
         "Containers": {
             "Doc": "doc",
             "Token": "token",
@@ -45,14 +47,19 @@
         }
     },
 
+    "cli": {
+        "title": "Command Line Interface",
+        "teaser": "Download, train and package models, and debug spaCy.",
+        "source": "spacy/cli"
+    },
+
     "top-level": {
         "title": "Top-level Functions",
         "menu": {
             "spacy": "spacy",
             "displacy": "displacy",
             "Utility Functions": "util",
-            "Compatibility": "compat",
-            "Command Line": "cli"
+            "Compatibility": "compat"
         }
     },
 
diff --git a/website/api/_top-level/_cli.jade b/website/api/cli.jade
similarity index 98%
rename from website/api/_top-level/_cli.jade
rename to website/api/cli.jade
index ec2c1737a..cd1cb22fb 100644
--- a/website/api/_top-level/_cli.jade
+++ b/website/api/cli.jade
@@ -1,4 +1,6 @@
-//- 💫 DOCS > API > TOP-LEVEL > COMMAND LINE INTERFACE
+//- 💫 DOCS > API > COMMAND LINE INTERFACE
+
+include ../_includes/_mixins
 
 p
     |  As of v1.7.0, spaCy comes with new command line helpers to download and
@@ -434,7 +436,8 @@ p
     +tag-new(2)
 
 p
-    |  Compile a vocabulary from a #[+a("#") lexicon JSONL] file and optional
+    |  Compile a vocabulary from a
+    |  #[+a("/api/annotation#vocab-jsonl") lexicon JSONL] file and optional
     |  word vectors. Will save out a valid spaCy model that you can load via
     |  #[+api("spacy#load") #[code spacy.load]] or package using the
     |  #[+api("cli#package") #[code package]] command.
@@ -459,7 +462,9 @@ p
     +row
         +cell #[code lexemes_loc]
         +cell positional
-        +cell Location of lexical data in spaCy's #[+a("#") JSONL format].
+        +cell
+            |  Location of lexical data in spaCy's
+            |  #[+a("/api/annotation#vocab-jsonl") JSONL format].
 
     +row
         +cell #[code vectors_loc]
diff --git a/website/api/top-level.jade b/website/api/top-level.jade
index 46d2e8750..f16daae23 100644
--- a/website/api/top-level.jade
+++ b/website/api/top-level.jade
@@ -18,7 +18,3 @@ include ../_includes/_mixins
 +section("compat")
     +h(2, "compat", "spacy/compaty.py") Compatibility functions
     include _top-level/_compat
-
-+section("cli", "spacy/cli")
-    +h(2, "cli") Command line
-    include _top-level/_cli