(Menu) Cleanups in menu_navigation.c