Improvements to main navigation and sub navigation.