diff --git a/_data/nav.yml b/_data/nav.yml
index e3fc8ddb6..64f662205 100644
--- a/_data/nav.yml
+++ b/_data/nav.yml
@@ -366,14 +366,14 @@
     - url: "#table_grid"
     - url: "#table_tab_navigation"
     - url: "#table_default_attributes"
-    - url: "#table_default_styles"    
+    - url: "#table_default_styles"
     - url: "#table_responsive_width"
     - url: "#table_class_list"
     - url: "#table_cell_class_list"
     - url: "#table_row_class_list"
     - url: "#table_advtab"
     - url: "#table_cell_advtab"
-    - url: "#table_resize_bars"    
+    - url: "#table_resize_bars"
     - url: "#table_style_by_css"
     - url: "#Commands"
     - url: "#API"
@@ -420,7 +420,7 @@
     - url: "#Overview"
     - url: "#Dialog configuration framework"
     - url: "#Dialog application examples"
-    - url: "#Dialog compostion"
+    - url: "#Dialog composition"
     - url: "#Dialog instance API"
   - url: "dialogcomponents"
     pages:
@@ -444,24 +444,25 @@
     - url: "#UrlInput"
   - url: "contextmenu"
     pages:
+    - url: "#Live example"
     - url: "#Options"
-    - url: "#Registering"
-    - url: "#ExampleUsage"
+    - url: "#Registering Context Menu Sections"
+    - url: "#Defining a Context Menu Section"
   - url: "contexttoolbar"
     pages:
-    - url: "#Registering"
-    - url: "#Launching"
-    - url: "#Priority"
-    - url: "#Positioning"
-    - url: "#Example"
+    - url: "#Registering a Context Toolbar"
+    - url: "#Launching a Context Toolbar Programmatically"
+    - url: "#Context Toolbar Priority"
+    - url: "#Positioning Context Toolbars"
+    - url: "#Example Configuration"
   - url: "contextform"
     pages:
-    - url: "#Registering"
+    - url: "#Registering a Context Form"
     - url: "#Launch"
-    - url: "#Priority"
-    - url: "#Positioning"
+    - url: "#Context Form Priority"
+    - url: "#Positioning Context Forms"
     - url: "#Form"
-    - url: "#ContextForm buttons"
+    - url: "#Context Form buttons"
     - url: "#Form API"
   - url: "toolbarbuttons"
   - url: "typesoftoolbarbuttons"