re-organise location of menus in control and server