more optimisations to menus