menu and routes fix