Tidied up menus.