diff --git a/docs/_data/nav.yml b/docs/_data/nav.yml
index a9e13ffda53f75b0f58a309080b86685b530aec6..26ef0e8fac74203534660e593eec1cab94751877 100644
--- a/docs/_data/nav.yml
+++ b/docs/_data/nav.yml
@@ -93,11 +93,24 @@
     - title: Button group
     - title: Button dropdown
     - title: Forms
-    - title: Custom forms
       sections:
+        - title: Form controls
+        - title: Form groups
+        - title: Inline forms
+        - title: Using the Grid
         - title: Checkboxes and radios
-        - title: Select menu
-        - title: File browser
+        - title: Static controls
+        - title: Focus state
+        - title: Disabled state
+        - title: Readonly inputs
+        - title: Validation
+        - title: Control sizing
+        - title: Column sizing
+        - title: Help text
+        - title: Custom forms
+        # - title: Checkboxes and radios
+        # - title: Select menu
+        # - title: File browser
     - title: Input group
       sections:
         - title: Basic example