some cleanup in navigation menus