Tweak of menu and type
further tweaking of menus