Continue refactoring of navigation. fixed category expand/collapse announcements