organise routes, fix menus