Fix routes and menu links