Adding Management of Top-Level Menus

Bug fixes