adjust to routing and menu refactoring