Genericized the menu system