diff --git a/_manual/04_ardours-interface/01_starting-ardour/01_starting-ardour-from-the-command-line.html b/_manual/04_ardours-interface/01_starting-ardour/01_starting-ardour-from-the-command-line.html
index 051ff2c3..eb186206 100644
--- a/_manual/04_ardours-interface/01_starting-ardour/01_starting-ardour-from-the-command-line.html
+++ b/_manual/04_ardours-interface/01_starting-ardour/01_starting-ardour-from-the-command-line.html
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Starting Ardour From the Command Line (Linux)
-menu-title: Starting from Linux Cmdline
+menu_title: Starting from Linux Cmdline
 ---                        
 
 
diff --git a/_manual/13_recording/01_monitoring/01_latency-considerations.html b/_manual/13_recording/01_monitoring/01_latency-considerations.html
index 505e26a0..061b2d41 100644
--- a/_manual/13_recording/01_monitoring/01_latency-considerations.html
+++ b/_manual/13_recording/01_monitoring/01_latency-considerations.html
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Latency Considerations
-menu-title: Latency
+menu_title: Latency
 ---                        
 
 <p>  
diff --git a/_manual/13_recording/01_monitoring/02_monitor-signal-flow.html b/_manual/13_recording/01_monitoring/02_monitor-signal-flow.html
index 260e9f9a..bddda13d 100644
--- a/_manual/13_recording/01_monitoring/02_monitor-signal-flow.html
+++ b/_manual/13_recording/01_monitoring/02_monitor-signal-flow.html
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Monitor Signal Flow
-menu-title: Signal Flow
+menu_title: Signal Flow
 ---                        
 
 <p>There are three basic ways to approach monitoring: </p>
diff --git a/_manual/13_recording/01_monitoring/03_monitor-setup-in-ardour.html b/_manual/13_recording/01_monitoring/03_monitor-setup-in-ardour.html
index 224d7b24..d112e9ea 100644
--- a/_manual/13_recording/01_monitoring/03_monitor-setup-in-ardour.html
+++ b/_manual/13_recording/01_monitoring/03_monitor-setup-in-ardour.html
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Monitor Setup in Ardour
-menu-title: Setup in Ardour
+menu_title: Setup in Ardour
 ---                        
 
 <p>Ardour has three main settings which affect how
diff --git a/_manual/14_signal-routing/02_comparing-aux-sends-and-subgroups.html b/_manual/14_signal-routing/02_comparing-aux-sends-and-subgroups.html
index 245c4c15..53dd9a57 100644
--- a/_manual/14_signal-routing/02_comparing-aux-sends-and-subgroups.html
+++ b/_manual/14_signal-routing/02_comparing-aux-sends-and-subgroups.html
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Comparing Aux Sends and Subgroups
-menu-title: Auxes vs. Groups
+menu_title: Auxes vs. Groups
 ---                        
 
 <p>
diff --git a/_manual/15_editing-and-arranging/04_snap-to-the-grid.html b/_manual/15_editing-and-arranging/04_snap-to-the-grid.html
index 5efb37a1..3ae4db46 100644
--- a/_manual/15_editing-and-arranging/04_snap-to-the-grid.html
+++ b/_manual/15_editing-and-arranging/04_snap-to-the-grid.html
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Snap to the Grid
-menu-title: Snap to Grid
+menu_title: Snap to Grid
 ---                        
 
 <p>
diff --git a/_manual/15_editing-and-arranging/05_common-region-edit-operations.html b/_manual/15_editing-and-arranging/05_common-region-edit-operations.html
index eefe313f..f77b6909 100644
--- a/_manual/15_editing-and-arranging/05_common-region-edit-operations.html
+++ b/_manual/15_editing-and-arranging/05_common-region-edit-operations.html
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Common Region Edit Operations
-menu-title: Region Editing
+menu_title: Region Editing
 ---                        
 
 <p>
diff --git a/_manual/15_editing-and-arranging/12_edit-midi/06_handle-overlapping-notes.html b/_manual/15_editing-and-arranging/12_edit-midi/06_handle-overlapping-notes.html
index 99a43c4e..9be72680 100644
--- a/_manual/15_editing-and-arranging/12_edit-midi/06_handle-overlapping-notes.html
+++ b/_manual/15_editing-and-arranging/12_edit-midi/06_handle-overlapping-notes.html
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Handling Overlapping Notes
-menu-title: Overlapping Notes
+menu_title: Overlapping Notes
 ---                        
   
 <p>
diff --git a/_manual/16_automation.html b/_manual/16_automation.html
index 0a7d79e3..a25f2713 100644
--- a/_manual/16_automation.html
+++ b/_manual/16_automation.html
@@ -3,8 +3,8 @@ layout: default
 title: Automation
 ---                        
 
-
-  
 <h2>Automation</h2>
 <p>This chapter covers the following:</p>
   
+{% children %}
+
diff --git a/_manual/21_preferences-and-session-properties/01_preferences-dialog.html b/_manual/21_preferences-and-session-properties/01_preferences-dialog.html
index 56fca491..2d90c8af 100644
--- a/_manual/21_preferences-and-session-properties/01_preferences-dialog.html
+++ b/_manual/21_preferences-and-session-properties/01_preferences-dialog.html
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Global Preferences Dialog
-menu-title: Global Preferences
+menu_title: Global Preferences
 ---                        
 
   
diff --git a/_manual/21_preferences-and-session-properties/02_seession-properties-dialog.html b/_manual/21_preferences-and-session-properties/02_seession-properties-dialog.html
index a4079923..dfebecd2 100644
--- a/_manual/21_preferences-and-session-properties/02_seession-properties-dialog.html
+++ b/_manual/21_preferences-and-session-properties/02_seession-properties-dialog.html
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Session Properties Dialog
-menu-title: Session Properties
+menu_title: Session Properties
 ---                        
 
 <img src="/files/a3/a3_session_properties.png" alt="session properties dialog"  />