Made menu items more general purpose