First pass by the Editor
Regenerated the navigation