Enh: improved menus