A little bit more reorganisation of menus