Menu system fix

Added new support for multiple menu items. Not yet operational.