Fixes to navigation menu manager
Fixes for navigation manager and header nav menu